From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 7 Jan 2011 03:57:53 +0000 (-0800)
Subject: ARM: Do not enable SWP emulation if CPU_V6 && CPU_V7
X-Git-Tag: firefly_0821_release~7613^2~2698^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e118a1df32c41186f717bbe6b42142741530e8b9;p=firefly-linux-kernel-4.4.55.git

ARM: Do not enable SWP emulation if CPU_V6 && CPU_V7

This option uses LDREXB/STREXB to emulate SWPB but these instructions
are not supported on all the ARMv6 processors.

Reported-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Leif Lindholm <Leif.Lindholm@arm.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

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