[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20160906170457.32393-20-bigeasy@linutronix.de>
Date: Tue, 6 Sep 2016 19:04:55 +0200
From: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
To: linux-kernel@...r.kernel.org
Cc: Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>, rt@...utronix.de,
tglx@...utronix.de,
Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Jens Axboe <axboe@...nel.dk>
Subject: [PATCH 19/21] blk: mq: reserve hotplug ID states for block
This patch only reseves two CPU hotplug ids for block/mq to avoid clashes
during merge.
Cc: Jens Axboe <axboe@...nel.dk>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@...utronix.de>
---
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,
--
2.9.3
Powered by blists - more mailing lists