summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-02-10 13:05:13 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-02-10 13:05:13 +0000
commit0193c00e85a35ceee7856c89c25b34d5752e0baa (patch)
tree408468e9de28798356703a4f699467c16ff6556b /arch/arm
parent15490ef8ff8fd22d677cb5d4f6a98e5a79118dba (diff)
downloadblackbird-op-linux-0193c00e85a35ceee7856c89c25b34d5752e0baa.tar.gz
blackbird-op-linux-0193c00e85a35ceee7856c89c25b34d5752e0baa.zip
ARM: make SWP emulation explicit on !CPU_USE_DOMAINS
SWP emulation requires that CPU domain support is disabled in order to work safely. Make that explicit in the kernel configuration to prevent illegal configurations being generated. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c9d2d56feced..e4509bae8fc4 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 && !CPU_V6
+ depends on !CPU_USE_DOMAINS && CPU_V7 && !CPU_V6
select HAVE_PROC_CPU if PROC_FS
default y if SMP
help
OpenPOWER on IntegriCloud