From dbf50025aa2b30451d2e9151fa0e0fee92806bdd Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Tue, 27 Mar 2012 13:47:57 -0400
Subject: [PATCH] --- yaml --- r: 298826 b: refs/heads/master c:
 8d6951439ef524683057251f1231df232046b6b6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b0f4e63fe42d..1871b968020d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34f2c0ac111aaf090c7d2432dab532640870733a
+refs/heads/master: 8d6951439ef524683057251f1231df232046b6b6
diff --git a/trunk/arch/tile/Kconfig b/trunk/arch/tile/Kconfig
index 11270ca22c0a..30413c1d1069 100644
--- a/trunk/arch/tile/Kconfig
+++ b/trunk/arch/tile/Kconfig
@@ -12,7 +12,7 @@ config TILE
 	select GENERIC_PENDING_IRQ if SMP
 	select GENERIC_IRQ_SHOW
 	select SYS_HYPERVISOR
-	select ARCH_HAVE_NMI_SAFE_CMPXCHG if !M386
+	select ARCH_HAVE_NMI_SAFE_CMPXCHG
 
 # FIXME: investigate whether we need/want these options.
 #	select HAVE_IOREMAP_PROT