diff -Naur linux-4.18.0-552.3.1.el8_10/include/linux/cpuhotplug.h linux-4.18.0-553.4.1.el8_10/include/linux/cpuhotplug.h
--- linux-4.18.0-552.3.1.el8_10/include/linux/cpuhotplug.h	2024-05-11 16:20:25
+++ linux-4.18.0-553.4.1.el8_10/include/linux/cpuhotplug.h	2024-05-15 17:42:15
@@ -151,7 +151,9 @@
 	 * the other CPUHP states are not changed or broken.
 	 */
 	RH_KABI_BROKEN_INSERT_ENUM(CPUHP_AP_SCHED_WAIT_EMPTY)
+#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
 	RH_KABI_BROKEN_INSERT_ENUM(CPUHP_AP_HYPERV_ONLINE)
+#endif
 	CPUHP_AP_SMPBOOT_THREADS,
 	RH_KABI_BROKEN_REMOVE_ENUM(CPUHP_AP_X86_VDSO_VMA_ONLINE)
 	CPUHP_AP_IRQ_AFFINITY_ONLINE,
@@ -165,7 +167,12 @@
 	CPUHP_AP_PERF_X86_CQM_ONLINE,
 	CPUHP_AP_PERF_X86_CSTATE_ONLINE,
 	/* kABI: CPUHP_AP_PERF_X86_IDXD_ONLINE, */
+#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
+	/* Compensate for the addition of CPUHP_AP_HYPERV_ONLINE */
+	RH_KABI_BROKEN_REMOVE_ENUM(CPUHP_AP_PERF_S390_CF_ONLINE)
+#else
 	CPUHP_AP_PERF_S390_CF_ONLINE,
+#endif
 	/* kABI: CPUHP_AP_PERF_S390_CFD_ONLINE, */
 	CPUHP_AP_PERF_S390_SF_ONLINE,
 	CPUHP_AP_PERF_ARM_CCI_ONLINE,