From: Russell King Date: Thu, 10 Feb 2011 13:05:13 +0000 (+0000) Subject: ARM: make SWP emulation explicit on !CPU_USE_DOMAINS X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~4235^2~7 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=0193c00e85a35ceee7856c89c25b34d5752e0baa;p=mirror_ubuntu-zesty-kernel.git 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 --- 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