Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 581388c1 authored by Russell King's avatar Russell King
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarSourav Poddar <sourav.poddar@ti.com>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 60799c6d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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