Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bf71e4d authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'smp/for-block' into smp/hotplug 

Bring in the block hotplug states for consistency.
parents 5372e054 e2a738f7

include/linux/cpuhotplug.h

+2 −0
Original line number Diff line number Diff line
@@ -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,