summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorNicolas Pitre2011-01-14 07:33:24 +0100
committerRussell King2011-01-14 10:00:46 +0100
commit4d2692a736c95240100755ba98b2403e11f12e06 (patch)
treece2e04aaeb7c6ab946400d49feeea8386db587ae /arch
parentARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S (diff)
downloadkernel-qcow2-linux-4d2692a736c95240100755ba98b2403e11f12e06.tar.gz
kernel-qcow2-linux-4d2692a736c95240100755ba98b2403e11f12e06.tar.xz
kernel-qcow2-linux-4d2692a736c95240100755ba98b2403e11f12e06.zip
ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP
This depends on !XIP_KERNEL and not !XIP. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a3fb23be87f3..53ea54782ef5 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1275,7 +1275,7 @@ config SMP
config SMP_ON_UP
bool "Allow booting SMP kernel on uniprocessor systems (EXPERIMENTAL)"
depends on EXPERIMENTAL
- depends on SMP && !XIP
+ depends on SMP && !XIP_KERNEL
default y
help
SMP kernels contain instructions which fail on non-SMP processors.