From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938789AbcIFRIo (ORCPT ); Tue, 6 Sep 2016 13:08:44 -0400 Received: from Galois.linutronix.de ([146.0.238.70]:36847 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964947AbcIFRGU (ORCPT ); Tue, 6 Sep 2016 13:06:20 -0400 From: Sebastian Andrzej Siewior To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , rt@linutronix.de, tglx@linutronix.de, Sebastian Andrzej Siewior , Jens Axboe Subject: [PATCH 19/21] blk: mq: reserve hotplug ID states for block Date: Tue, 6 Sep 2016 19:04:55 +0200 Message-Id: <20160906170457.32393-20-bigeasy@linutronix.de> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160906170457.32393-1-bigeasy@linutronix.de> References: <20160906170457.32393-1-bigeasy@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch only reseves two CPU hotplug ids for block/mq to avoid clashes during merge. Cc: Jens Axboe Signed-off-by: Sebastian Andrzej Siewior --- include/linux/cpuhotplug.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index eb0298440206..fceebbe77dd5 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -27,6 +27,7 @@ enum cpuhp_state { CPUHP_VIRT_SCSI_DEAD, CPUHP_ACPI_CPUDRV_DEAD, CPUHP_S390_PFAULT_DEAD, + CPUHP_BLKMQ_DEAD, CPUHP_WORKQUEUE_PREP, CPUHP_POWER_NUMA_PREPARE, CPUHP_HRTIMERS_PREPARE, @@ -47,6 +48,7 @@ enum cpuhp_state { CPUHP_NOTF_ERR_INJ_PREPARE, CPUHP_MIPS_CAVIUM_PREPARE, CPUHP_MIPS_LOONGSON_PREPARE, + CPUHP_BLK_MQ_PREPARE, CPUHP_TIMERS_DEAD, CPUHP_BRINGUP_CPU, CPUHP_AP_IDLE_DEAD, --=20 2.9.3