Skip to contentSkip to conversation

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

PATCH In review Rusty Russell 1 participant 2 messages Jan 5, 2010 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/x86/Kconfig.cpu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/Kconfig.cpu +1 -1
index 08e442b..f20ddf8 100644
@@ -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.
#1 lore raw
Commit-ID:  f4b825bde98938f160315d655597bc9731521cae
Gitweb:     http://git.kernel.org/tip/f4b825bde98938f160315d655597bc9731521cae
Author:     Rusty Russell <[email protected]>
AuthorDate: Tue, 5 Jan 2010 12:48:49 +1030
Committer:  H. Peter Anvin <[email protected]>
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.

LKML-Reference: <[email protected]>

---
 arch/x86/Kconfig.cpu |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/Kconfig.cpu +1 -1
index 08e442b..f20ddf8 100644
@@ -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.