[2.6 patch] x86: revert X86_HT semantics change

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Thomas Gleixner <tglx@...>
Cc: Sam Ravnborg <sam@...>, <mingo@...>, <hpa@...>, <linux-kernel@...>
Date: Thursday, November 15, 2007 - 2:19 pm

On Thu, Nov 15, 2007 at 07:07:11PM +0100, Thomas Gleixner wrote:

*searches brown paperbag*

Thanks for spotting, fixed patch below.


cu
Adrian


<--  snip  -->


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

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>

---
480a5ae48036f6825a5a111db87da05e298327d6 
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index af1b1ca..5871b44 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

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[2.6 patch] x86: revert X86_HT semantics change, Adrian Bunk, (Thu Nov 15, 12:17 pm)
Re: [2.6 patch] x86: revert X86_HT semantics change, Sam Ravnborg, (Thu Nov 15, 2:04 pm)
Re: [2.6 patch] x86: revert X86_HT semantics change, Thomas Gleixner, (Thu Nov 15, 2:07 pm)
Re: [2.6 patch] x86: revert X86_HT semantics change, Sam Ravnborg, (Thu Nov 15, 2:42 pm)
Re: [2.6 patch] x86: revert X86_HT semantics change, Adrian Bunk, (Thu Nov 15, 2:48 pm)
[2.6 patch] x86: revert X86_HT semantics change, Adrian Bunk, (Thu Nov 15, 2:19 pm)
Re: [2.6 patch] x86: revert X86_HT semantics change, Ingo Molnar, (Tue Dec 4, 9:29 am)
Re: [2.6 patch] x86: revert X86_HT semantics change, Adrian Bunk, (Tue Dec 4, 9:55 am)