[tip:x86/urgent] Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

Previous thread: [PATCH] [0/9] SYSCTL: Use RCU to avoid races with string sysctls v2 by Andi Kleen on Monday, January 4, 2010 - 7:15 pm. (24 messages)

Next thread: [PATCH 1/2] [mmotm] Add swap slot free callback to block_device_operations by Nitin Gupta on Monday, January 4, 2010 - 8:18 pm. (5 messages)
From: Rusty Russell
Date: Monday, January 4, 2010 - 7:18 pm

This reverts commit ae1b22f6e46c03cede7cea234d0bf2253b4261cf.
    
As Linus said in 982d007a6ee: "There was something really messy about
cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it
carefully."
    
This breaks lguest for those configs, but we can fix that by emulating
if we have to.
    
Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: stable@kernel.org
---
 arch/x86/Kconfig.cpu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 08e442b..f20ddf8 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -396,7 +396,7 @@ config X86_TSC
 
 config X86_CMPXCHG64
 	def_bool y
-	depends on !M386 && !M486
+	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
 
 # this should be set for all -march=.. options where the compiler
 # generates cmov.
--

From: tip-bot for Rusty Russell
Date: Monday, January 4, 2010 - 9:48 pm

Commit-ID:  f4b825bde98938f160315d655597bc9731521cae
Gitweb:     http://git.kernel.org/tip/f4b825bde98938f160315d655597bc9731521cae
Author:     Rusty Russell <rusty@rustcorp.com.au>
AuthorDate: Tue, 5 Jan 2010 12:48:49 +1030
Committer:  H. Peter Anvin <hpa@zytor.com>
CommitDate: Mon, 4 Jan 2010 19:35:49 -0800

Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"

This reverts commit ae1b22f6e46c03cede7cea234d0bf2253b4261cf.

As Linus said in 982d007a6ee: "There was something really messy about
cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it
carefully."

This breaks lguest for those configs, but we can fix that by emulating
if we have to.

Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
LKML-Reference: <201001051248.49700.rusty@rustcorp.com.au>
Cc: stable@kernel.org
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---
 arch/x86/Kconfig.cpu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index 08e442b..f20ddf8 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -396,7 +396,7 @@ config X86_TSC
 
 config X86_CMPXCHG64
 	def_bool y
-	depends on !M386 && !M486
+	depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
 
 # this should be set for all -march=.. options where the compiler
 # generates cmov.
--

Previous thread: [PATCH] [0/9] SYSCTL: Use RCU to avoid races with string sysctls v2 by Andi Kleen on Monday, January 4, 2010 - 7:15 pm. (24 messages)

Next thread: [PATCH 1/2] [mmotm] Add swap slot free callback to block_device_operations by Nitin Gupta on Monday, January 4, 2010 - 8:18 pm. (5 messages)