Re: [PATCH 5/8] x86: remove dependencies on CONFIG_M... CPU options

[Juergen Gross]

On 22.05.26 16:19, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> 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 <arnd@xxxxxxxx>
> ---
>   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

This is problematic. See commit 93cd05976498.

Maybe use "depends on X86_LOCAL_APIC && X86_L1_CACHE_SHIFT >= 6" instead?


Juergen

Attachment: OpenPGP_0xB0DE9DD628BF132F.asc
Description: OpenPGP public key

Attachment: OpenPGP_signature.asc
Description: OpenPGP digital signature