From: Dave Hansen <dave.hansen@linux.intel.com>

Begin constructing a common place to keep all CPUID leaf definitions.
Move CPUID_MWAIT_LEAF to the CPUID header and include it where
needed.

Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
---

 b/arch/x86/include/asm/cpuid.h  |    2 ++
 b/arch/x86/include/asm/mwait.h  |    1 -
 b/arch/x86/kernel/acpi/cstate.c |    1 +
 b/arch/x86/kernel/hpet.c        |    1 +
 b/arch/x86/kernel/process.c     |    1 +
 b/arch/x86/kernel/smpboot.c     |    1 +
 b/arch/x86/xen/enlighten_pv.c   |    1 +
 b/drivers/acpi/acpi_pad.c       |    1 +
 b/drivers/idle/intel_idle.c     |    1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

diff -puN arch/x86/include/asm/cpuid.h~mwait-leaf-checks-0 arch/x86/include/asm/cpuid.h
--- a/arch/x86/include/asm/cpuid.h~mwait-leaf-checks-0	2024-10-30 12:28:09.050350096 -0700
+++ b/arch/x86/include/asm/cpuid.h	2024-10-30 12:28:09.062350119 -0700
@@ -19,6 +19,8 @@ enum cpuid_regs_idx {
 	CPUID_EDX,
 };
 
+#define CPUID_MWAIT_LEAF		5
+
 #ifdef CONFIG_X86_32
 extern int have_cpuid_p(void);
 #else
diff -puN arch/x86/include/asm/mwait.h~mwait-leaf-checks-0 arch/x86/include/asm/mwait.h
--- a/arch/x86/include/asm/mwait.h~mwait-leaf-checks-0	2024-10-30 12:28:09.050350096 -0700
+++ b/arch/x86/include/asm/mwait.h	2024-10-30 12:28:09.062350119 -0700
@@ -15,7 +15,6 @@
 #define MWAIT_HINT2SUBSTATE(hint)	((hint) & MWAIT_CSTATE_MASK)
 #define MWAIT_C1_SUBSTATE_MASK  0xf0
 
-#define CPUID_MWAIT_LEAF		5
 #define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1
 #define CPUID5_ECX_INTERRUPT_BREAK	0x2
 
diff -puN arch/x86/kernel/acpi/cstate.c~mwait-leaf-checks-0 arch/x86/kernel/acpi/cstate.c
--- a/arch/x86/kernel/acpi/cstate.c~mwait-leaf-checks-0	2024-10-30 12:28:09.054350104 -0700
+++ b/arch/x86/kernel/acpi/cstate.c	2024-10-30 12:28:09.062350119 -0700
@@ -13,6 +13,7 @@
 #include <linux/sched.h>
 
 #include <acpi/processor.h>
+#include <asm/cpuid.h>
 #include <asm/mwait.h>
 #include <asm/special_insns.h>
 
diff -puN arch/x86/kernel/hpet.c~mwait-leaf-checks-0 arch/x86/kernel/hpet.c
--- a/arch/x86/kernel/hpet.c~mwait-leaf-checks-0	2024-10-30 12:28:09.054350104 -0700
+++ b/arch/x86/kernel/hpet.c	2024-10-30 12:28:09.062350119 -0700
@@ -7,6 +7,7 @@
 #include <linux/cpu.h>
 #include <linux/irq.h>
 
+#include <asm/cpuid.h>
 #include <asm/irq_remapping.h>
 #include <asm/hpet.h>
 #include <asm/time.h>
diff -puN arch/x86/kernel/process.c~mwait-leaf-checks-0 arch/x86/kernel/process.c
--- a/arch/x86/kernel/process.c~mwait-leaf-checks-0	2024-10-30 12:28:09.054350104 -0700
+++ b/arch/x86/kernel/process.c	2024-10-30 12:28:09.062350119 -0700
@@ -30,6 +30,7 @@
 #include <linux/hw_breakpoint.h>
 #include <linux/entry-common.h>
 #include <asm/cpu.h>
+#include <asm/cpuid.h>
 #include <asm/apic.h>
 #include <linux/uaccess.h>
 #include <asm/mwait.h>
diff -puN arch/x86/kernel/smpboot.c~mwait-leaf-checks-0 arch/x86/kernel/smpboot.c
--- a/arch/x86/kernel/smpboot.c~mwait-leaf-checks-0	2024-10-30 12:28:09.058350111 -0700
+++ b/arch/x86/kernel/smpboot.c	2024-10-30 12:28:09.062350119 -0700
@@ -64,6 +64,7 @@
 
 #include <asm/acpi.h>
 #include <asm/cacheinfo.h>
+#include <asm/cpuid.h>
 #include <asm/desc.h>
 #include <asm/nmi.h>
 #include <asm/irq.h>
diff -puN arch/x86/xen/enlighten_pv.c~mwait-leaf-checks-0 arch/x86/xen/enlighten_pv.c
--- a/arch/x86/xen/enlighten_pv.c~mwait-leaf-checks-0	2024-10-30 12:28:09.058350111 -0700
+++ b/arch/x86/xen/enlighten_pv.c	2024-10-30 12:28:09.062350119 -0700
@@ -49,6 +49,7 @@
 #include <xen/hvc-console.h>
 #include <xen/acpi.h>
 
+#include <asm/cpuid.h>
 #include <asm/paravirt.h>
 #include <asm/apic.h>
 #include <asm/page.h>
diff -puN drivers/acpi/acpi_pad.c~mwait-leaf-checks-0 drivers/acpi/acpi_pad.c
--- a/drivers/acpi/acpi_pad.c~mwait-leaf-checks-0	2024-10-30 12:28:09.058350111 -0700
+++ b/drivers/acpi/acpi_pad.c	2024-10-30 12:28:09.062350119 -0700
@@ -19,6 +19,7 @@
 #include <linux/acpi.h>
 #include <linux/perf_event.h>
 #include <linux/platform_device.h>
+#include <asm/cpuid.h>
 #include <asm/mwait.h>
 #include <xen/xen.h>
 
diff -puN drivers/idle/intel_idle.c~mwait-leaf-checks-0 drivers/idle/intel_idle.c
--- a/drivers/idle/intel_idle.c~mwait-leaf-checks-0	2024-10-30 12:28:09.062350119 -0700
+++ b/drivers/idle/intel_idle.c	2024-10-30 12:28:09.062350119 -0700
@@ -51,6 +51,7 @@
 #include <linux/notifier.h>
 #include <linux/cpu.h>
 #include <linux/moduleparam.h>
+#include <asm/cpuid.h>
 #include <asm/cpu_device_id.h>
 #include <asm/intel-family.h>
 #include <asm/mwait.h>
_