[PATCH 5/8] x86: remove dependencies on CONFIG_M... CPU options
Arnd Bergmann <[email protected]>
| Newsgroups | gmane.linux.uml.devel,gmane.linux.kernel |
|---|---|
| Message-ID | <[email protected]> |
From: Arnd Bergmann <[email protected]> CPU specific features should generally be controlled by CPU_SUP_xxx options rather than CONFIG_Mxxx, to allow generic kernels to be built that work with all of them. Replace the few options that don't follow this scheme with checks on either CPU_SUP_xxx or X86_PAE by itself. Signed-off-by: Arnd Bergmann <[email protected]> --- arch/x86/kernel/tsc.c | 2 +- arch/x86/xen/Kconfig | 3 +-- drivers/misc/mei/Kconfig | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index e7a43471783f..3d5d38035c52 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -1213,7 +1213,7 @@ static void __init tsc_disable_clocksource_watchdog(void) static void __init check_system_tsc_reliable(void) { -#if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC) +#if defined(CONFIG_CPU_SUP_CYRIX_32) if (is_geode_lx()) { /* RTSC counts during suspend */ #define RTSC_SUSP 0x100 diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig index aa4040fd9215..7e74db652215 100644 --- a/arch/x86/xen/Kconfig +++ b/arch/x86/xen/Kconfig @@ -10,8 +10,7 @@ config XEN select X86_HV_CALLBACK_VECTOR select HIBERNATE_CALLBACKS depends on X86_64 || (X86_32 && X86_PAE) - depends on X86_64 || (X86_GENERIC || MPENTIUM4 || MATOM) - depends on X86_LOCAL_APIC && X86_TSC + depends on X86_LOCAL_APIC help This is the Linux Xen port. Enabling this will allow the kernel to boot in a paravirtualized environment under the diff --git a/drivers/misc/mei/Kconfig b/drivers/misc/mei/Kconfig index 2d1bc5b4d11b..faa451584002 100644 --- a/drivers/misc/mei/Kconfig +++ b/drivers/misc/mei/Kconfig @@ -4,7 +4,7 @@ config INTEL_MEI tristate "Intel Management Engine Interface" depends on PCI depends on X86 || DRM_XE!=n || COMPILE_TEST - default X86_64 || MATOM + default X86_64 || CPU_SUP_INTEL help The Intel Management Engine (Intel ME) provides Manageability, Security and Media services for system containing Intel chipsets. -- 2.39.5