From e41a5bae01f08f7084cb5668d9922b498edbc403 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 3 Nov 2021 10:17:47 +0100 Subject: [PATCH] x86: de-duplicate MONITOR/MWAIT CPUID-related definitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit As of 724b55f48a6c ("x86: introduce MWAIT-based, ACPI-less CPU idle driver") they (also) live in asm/mwait.h; no idea how I missed the duplicates back at the time. Signed-off-by: Jan Beulich Acked-by: Roger Pau Monné Release-Acked-by: Ian Jackson --- xen/arch/x86/acpi/lib.c | 1 + xen/include/asm-x86/cpufeature.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/xen/arch/x86/acpi/lib.c b/xen/arch/x86/acpi/lib.c index a22414a05c..b66e7338e7 100644 --- a/xen/arch/x86/acpi/lib.c +++ b/xen/arch/x86/acpi/lib.c @@ -24,6 +24,7 @@ #include #include #include +#include u32 __read_mostly acpi_smi_cmd; u8 __read_mostly acpi_enable_value; diff --git a/xen/include/asm-x86/cpufeature.h b/xen/include/asm-x86/cpufeature.h index 802d9257b0..ba0fe7c0aa 100644 --- a/xen/include/asm-x86/cpufeature.h +++ b/xen/include/asm-x86/cpufeature.h @@ -22,10 +22,6 @@ #define cpu_has(c, bit) test_bit(bit, (c)->x86_capability) #define boot_cpu_has(bit) test_bit(bit, boot_cpu_data.x86_capability) -#define CPUID_MWAIT_LEAF 5 -#define CPUID5_ECX_EXTENSIONS_SUPPORTED 0x1 -#define CPUID5_ECX_INTERRUPT_BREAK 0x2 - #define CPUID_PM_LEAF 6 #define CPUID6_ECX_APERFMPERF_CAPABILITY 0x1 -- 2.39.5