Messages in this thread Patch in this message | | | Date | Thu, 15 Nov 2007 17:17:03 +0100 | From | Adrian Bunk <> | Subject | [2.6 patch] x86: revert X86_HT semantics change |
| |
The x86 unification resulted in CONFIG_X86_HT no longer being set if (X86_32 && MK8).
After grep'ing through the tree I think the problem is that different places have different assumptions about the semantics of CONFIG_X86_HT, either: - hyperthreading or - multicore and the SCHED_SMT and SCHED_MC dependencies are just one of the symptoms.
This should be sorted out properly, but until then we should keep the 2.6.23 status quo.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
---
arch/x86/Kconfig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
18fef247715449d36438fe4de59fdf430f1b5c37 diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1eb5997..2c357f0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -148,7 +148,8 @@ config X86_SMP config X86_HT bool - depends on SMP && !(X86_VISWS || X86_VOYAGER || MK8) + depends on SMP + depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || (X86_64 && !MK8) default y config X86_BIOS_REBOOT @@ -476,7 +477,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 @@ -485,7 +486,7 @@ config SCHED_SMT config SCHED_MC bool "Multi-core scheduler support" - depends on (X86_64 && SMP) || (X86_32 && X86_HT) + depends on X86_HT default y help Multi-core scheduler support improves the CPU scheduler's decision - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |