Re: [PATCH] x86: X86_HT always enable on X86_64 SMP

[Adrian Bunk <bunk@kernel.org>]

On Wed, Feb 27, 2008 at 01:16:30PM -0800, Hiroshi Shimamoto wrote:
> From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> 
> X86_HT is used for hyperthreading or multicore on 32-bit.
> The X86_HT on 64-bit is different from 32-bit, it means hyperthreading only.
> And X86_HT is not used on 64-bit except from cpu/initel_cacheinfo.c.
> 
> Unify X86_HT for hyperthreading or multicore.
> Turn X86_HT on when X86_64 and SMP are enabled.

Please fix it properly instead - fiddling around with it the way you do
only asks for trouble in the future.

What we need are two different variables for:
- hyperthreading and
- multicore

> Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
> ---
>  arch/x86/Kconfig |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 5bbb385..7168437 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -174,7 +174,7 @@ config X86_64_SMP
>  config X86_HT
>  	bool
>  	depends on SMP
> -	depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8)
> +	depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || X86_64
>  	default y
>  
>  config X86_BIOS_REBOOT
> @@ -516,7 +516,7 @@ config NR_CPUS
>  
>  config SCHED_SMT
>  	bool "SMT (Hyperthreading) scheduler support"
> -	depends on (X86_64 && SMP) || (X86_32 && X86_HT)
> +	depends on X86_HT
>  	help
>  	  SMT scheduler support improves the CPU scheduler's decision making
>  	  when dealing with Intel Pentium 4 chips with HyperThreading at a
> @@ -526,7 +526,7 @@ config SCHED_SMT
>  config SCHED_MC
>  	def_bool y
>  	prompt "Multi-core scheduler support"
> -	depends on (X86_64 && SMP) || (X86_32 && X86_HT)
> +	depends on X86_HT
>  	help
>  	  Multi-core scheduler support improves the CPU scheduler's decision
>  	  making when dealing with multi-core CPU chips at a cost of slightly

And any proper fix should result in SCHED_SMT and SCHED_MC getting 
different dependencies.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed