@@ -66,15 +66,12 @@ enum cpuhp_state {
6666 CPUHP_PERF_POWER ,
6767 CPUHP_PERF_SUPERH ,
6868 CPUHP_X86_HPET_DEAD ,
69- CPUHP_X86_APB_DEAD ,
7069 CPUHP_X86_MCE_DEAD ,
7170 CPUHP_VIRT_NET_DEAD ,
7271 CPUHP_IBMVNIC_DEAD ,
7372 CPUHP_SLUB_DEAD ,
7473 CPUHP_DEBUG_OBJ_DEAD ,
7574 CPUHP_MM_WRITEBACK_DEAD ,
76- /* Must be after CPUHP_MM_VMSTAT_DEAD */
77- CPUHP_MM_DEMOTION_DEAD ,
7875 CPUHP_MM_VMSTAT_DEAD ,
7976 CPUHP_SOFTIRQ_DEAD ,
8077 CPUHP_NET_MVNETA_DEAD ,
@@ -96,7 +93,6 @@ enum cpuhp_state {
9693 CPUHP_NET_DEV_DEAD ,
9794 CPUHP_PCI_XGENE_DEAD ,
9895 CPUHP_IOMMU_IOVA_DEAD ,
99- CPUHP_LUSTRE_CFS_DEAD ,
10096 CPUHP_AP_ARM_CACHE_B15_RAC_DEAD ,
10197 CPUHP_PADATA_DEAD ,
10298 CPUHP_AP_DTPM_CPU_DEAD ,
@@ -118,7 +114,6 @@ enum cpuhp_state {
118114 CPUHP_XEN_EVTCHN_PREPARE ,
119115 CPUHP_ARM_SHMOBILE_SCU_PREPARE ,
120116 CPUHP_SH_SH3X_PREPARE ,
121- CPUHP_NET_FLOW_PREPARE ,
122117 CPUHP_TOPOLOGY_PREPARE ,
123118 CPUHP_NET_IUCV_PREPARE ,
124119 CPUHP_ARM_BL_PREPARE ,
@@ -151,18 +146,14 @@ enum cpuhp_state {
151146 CPUHP_AP_IRQ_ARMADA_XP_STARTING ,
152147 CPUHP_AP_IRQ_BCM2836_STARTING ,
153148 CPUHP_AP_IRQ_MIPS_GIC_STARTING ,
154- CPUHP_AP_IRQ_RISCV_STARTING ,
155149 CPUHP_AP_IRQ_LOONGARCH_STARTING ,
156150 CPUHP_AP_IRQ_SIFIVE_PLIC_STARTING ,
157151 CPUHP_AP_ARM_MVEBU_COHERENCY ,
158- CPUHP_AP_MICROCODE_LOADER ,
159152 CPUHP_AP_PERF_X86_AMD_UNCORE_STARTING ,
160153 CPUHP_AP_PERF_X86_STARTING ,
161154 CPUHP_AP_PERF_X86_AMD_IBS_STARTING ,
162- CPUHP_AP_PERF_X86_CQM_STARTING ,
163155 CPUHP_AP_PERF_X86_CSTATE_STARTING ,
164156 CPUHP_AP_PERF_XTENSA_STARTING ,
165- CPUHP_AP_MIPS_OP_LOONGSON3_STARTING ,
166157 CPUHP_AP_ARM_VFP_STARTING ,
167158 CPUHP_AP_ARM64_DEBUG_MONITORS_STARTING ,
168159 CPUHP_AP_PERF_ARM_HW_BREAKPOINT_STARTING ,
@@ -179,7 +170,6 @@ enum cpuhp_state {
179170 CPUHP_AP_QCOM_TIMER_STARTING ,
180171 CPUHP_AP_TEGRA_TIMER_STARTING ,
181172 CPUHP_AP_ARMADA_TIMER_STARTING ,
182- CPUHP_AP_MARCO_TIMER_STARTING ,
183173 CPUHP_AP_MIPS_GIC_TIMER_STARTING ,
184174 CPUHP_AP_ARC_TIMER_STARTING ,
185175 CPUHP_AP_RISCV_TIMER_STARTING ,
@@ -217,9 +207,7 @@ enum cpuhp_state {
217207 CPUHP_AP_PERF_X86_AMD_UNCORE_ONLINE ,
218208 CPUHP_AP_PERF_X86_AMD_POWER_ONLINE ,
219209 CPUHP_AP_PERF_X86_RAPL_ONLINE ,
220- CPUHP_AP_PERF_X86_CQM_ONLINE ,
221210 CPUHP_AP_PERF_X86_CSTATE_ONLINE ,
222- CPUHP_AP_PERF_X86_IDXD_ONLINE ,
223211 CPUHP_AP_PERF_S390_CF_ONLINE ,
224212 CPUHP_AP_PERF_S390_SF_ONLINE ,
225213 CPUHP_AP_PERF_ARM_CCI_ONLINE ,
@@ -252,8 +240,6 @@ enum cpuhp_state {
252240 CPUHP_AP_BASE_CACHEINFO_ONLINE ,
253241 CPUHP_AP_ONLINE_DYN ,
254242 CPUHP_AP_ONLINE_DYN_END = CPUHP_AP_ONLINE_DYN + 30 ,
255- /* Must be after CPUHP_AP_ONLINE_DYN for node_states[N_CPU] update */
256- CPUHP_AP_MM_DEMOTION_ONLINE ,
257243 CPUHP_AP_X86_HPET_ONLINE ,
258244 CPUHP_AP_X86_KVM_CLK_ONLINE ,
259245 CPUHP_AP_ACTIVE ,
0 commit comments