From 878b03376ad27b6cd7eeb936d0474148e1315b26 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Tue, 5 Jan 2010 12:48:49 +1030
Subject: [PATCH] --- yaml --- r: 178771 b: refs/heads/master c:
 db677ffa5f5a4f15b9dad4d132b3477b80766d82 h: refs/heads/master i:   178769:
 72ce2bb0eea74ec0f8ce19a146190113cff4735d   178767:
 bfc60bffc40fc98f3f2d49318fe5ad6144d90a3f v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/Kconfig.cpu | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 55ece37bc817..bb03b9259ea7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6307daad8496f5807a2ef60cbada55fe3b59c44e
+refs/heads/master: db677ffa5f5a4f15b9dad4d132b3477b80766d82
diff --git a/trunk/arch/x86/Kconfig.cpu b/trunk/arch/x86/Kconfig.cpu
index 08e442bc3ab9..f20ddf84a893 100644
--- a/trunk/arch/x86/Kconfig.cpu
+++ b/trunk/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.