From: Nicolas Pitre <nico@fluxnic.net>
Date: Fri, 14 Jan 2011 06:33:24 +0000 (+0100)
Subject: ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP
X-Git-Tag: v2.6.38-rc1~39^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4d2692a736c95240100755ba98b2403e11f12e06;p=~emulex%2Finfiniband.git

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>
---

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a3fb23be87f..53ea54782ef 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.