Commit b089c12b authored by Hiroshi Shimamoto's avatar Hiroshi Shimamoto Committed by Ingo Molnar

x86: X86_HT always enable on X86_64 SMP

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.
Signed-off-by: default avatarHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e3100c82
...@@ -171,7 +171,7 @@ config X86_64_SMP ...@@ -171,7 +171,7 @@ config X86_64_SMP
config X86_HT config X86_HT
bool bool
depends on SMP 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 default y
config X86_BIOS_REBOOT config X86_BIOS_REBOOT
...@@ -508,7 +508,7 @@ config NR_CPUS ...@@ -508,7 +508,7 @@ config NR_CPUS
config SCHED_SMT config SCHED_SMT
bool "SMT (Hyperthreading) scheduler support" bool "SMT (Hyperthreading) scheduler support"
depends on (X86_64 && SMP) || (X86_32 && X86_HT) depends on X86_HT
help help
SMT scheduler support improves the CPU scheduler's decision making SMT scheduler support improves the CPU scheduler's decision making
when dealing with Intel Pentium 4 chips with HyperThreading at a when dealing with Intel Pentium 4 chips with HyperThreading at a
...@@ -518,7 +518,7 @@ config SCHED_SMT ...@@ -518,7 +518,7 @@ config SCHED_SMT
config SCHED_MC config SCHED_MC
def_bool y def_bool y
prompt "Multi-core scheduler support" prompt "Multi-core scheduler support"
depends on (X86_64 && SMP) || (X86_32 && X86_HT) depends on X86_HT
help help
Multi-core scheduler support improves the CPU scheduler's decision Multi-core scheduler support improves the CPU scheduler's decision
making when dealing with multi-core CPU chips at a cost of slightly making when dealing with multi-core CPU chips at a cost of slightly
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment