diff options
| author |   Adrian Bunk <bunk@kernel.org> | 2007-12-04 17:19:07 +0100 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2007-12-04 17:19:07 +0100 |
| commit | ee0011a798ba0e9134506830c58323f2bfcd2443 (patch) | |
| tree | 4b0e72cc058351ecafb99e44fe9d4599254cffef /arch/x86 | |
| parent | Linux 2.6.24-rc4 (diff) | |
| download | linux-dev-ee0011a798ba0e9134506830c58323f2bfcd2443.tar.xz linux-dev-ee0011a798ba0e9134506830c58323f2bfcd2443.zip | |
x86: revert CONFIG_X86_HT semantics change
The recent Kconfig changes in x86 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
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>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 368864dfe6eb..391cb1894127 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 |