diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-21 09:39:00 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-21 09:39:00 +0200 |
| commit | 0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d (patch) | |
| tree | 9028192abac063b183d1901fbfa38a3aa6e40251 | |
| parent | 5372e054a1928fe704cf0a5e2e139645a777b50a (diff) | |
| parent | e2a738f7a88f32622684d972d654a9fed026555f (diff) | |
| download | op-kernel-dev-0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d.zip op-kernel-dev-0bf71e4d02ffec8ab9a6adecca61d3eed74fc99d.tar.gz | |
Merge branch 'smp/for-block' into smp/hotplug
Bring in the block hotplug states for consistency.
| -rw-r--r-- | include/linux/cpuhotplug.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index dea6696..510205e 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_BLK_MQ_DEAD, CPUHP_WORKQUEUE_PREP, CPUHP_POWER_NUMA_PREPARE, CPUHP_HRTIMERS_PREPARE, @@ -43,6 +44,7 @@ enum cpuhp_state { CPUHP_NOTIFY_PREPARE, CPUHP_ARM_SHMOBILE_SCU_PREPARE, CPUHP_SH_SH3X_PREPARE, + CPUHP_BLK_MQ_PREPARE, CPUHP_TIMERS_DEAD, CPUHP_NOTF_ERR_INJ_PREPARE, CPUHP_MIPS_SOC_PREPARE, |
