From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 17 Jan 2011 17:27:48 +0000 (+0000)
Subject: ARM: v6k: allow swp emulation again when ARMv7 is enabled
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=581388c15bd61a2548af0b87152648741d038571;p=linux-beck.git

ARM: v6k: allow swp emulation again when ARMv7 is enabled

Now that we build a v6+v6k+v7 kernel with -march=armv6k for everything,
we don't need to disable swp emulation to work around the build problem
with OMAP.

Tested-by: Tony Lindgren <tony@atomide.com>
Tested-by: Sourav Poddar <sourav.poddar@ti.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index ca1238baef71..843bc8c74b87 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -652,7 +652,7 @@ config ARM_THUMBEE
 
 config SWP_EMULATE
 	bool "Emulate SWP/SWPB instructions"
-	depends on CPU_V7 && !CPU_V6
+	depends on CPU_V7
 	select HAVE_PROC_CPU if PROC_FS
 	default y if SMP
 	help