Commit:     ee0011a798ba0e9134506830c58323f2bfcd2443
Parent:     09b56adc98e0f8a21644fcb4d20ad367c3fceb55
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Tue Dec 4 17:19:07 2007 +0100
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Tue Dec 4 17:19:07 2007 +0100

    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,
    - 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 <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/Kconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 368864d..391cb18 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -148,7 +148,8 @@ config X86_SMP
 config X86_HT
-       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
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to