git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From db677ffa5f5a4f15b9dad4d132b3477b80766d82 Mon Sep 17 00:00:00 2001
   2 From: Rusty Russell <rusty@rustcorp.com.au>
   3 Date: Tue, 5 Jan 2010 12:48:49 +1030
   4 Subject: Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"
   5
   6 From: Rusty Russell <rusty@rustcorp.com.au>
   7
   8 commit db677ffa5f5a4f15b9dad4d132b3477b80766d82 upstream.
   9
  10 This reverts commit ae1b22f6e46c03cede7cea234d0bf2253b4261cf.
  11
  12 As Linus said in 982d007a6ee: "There was something really messy about
  13 cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it
  14 carefully."
  15
  16 This breaks lguest for those configs, but we can fix that by emulating
  17 if we have to.
  18
  19 Fixes: http://bugzilla.kernel.org/show_bug.cgi?id=14884
  20 Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
  21 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  22 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  23
  24 ---
  25  arch/x86/Kconfig.cpu |    2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 --- a/arch/x86/Kconfig.cpu
  29 +++ b/arch/x86/Kconfig.cpu
  30 @@ -400,7 +400,7 @@ config X86_TSC
  31
  32  config X86_CMPXCHG64
  33         def_bool y
  34 -       depends on !M386 && !M486
  35 +       depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM
  36
  37  # this should be set for all -march=.. options where the compiler
  38  # generates cmov.