summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2011-04-08 04:20:54 -0500
committerKumar Gala <galak@kernel.crashing.org>2011-04-12 06:29:21 -0500
commite5462d16f76ad7a9156a82a97fbafba298da9ca6 (patch)
tree2fd28349828a7a5957fbcc809a20e42506ae778b
parentd51ad91535b75c043f074f093ef913fe20ff2b5e (diff)
downloadtalos-obmc-linux-e5462d16f76ad7a9156a82a97fbafba298da9ca6.tar.gz
talos-obmc-linux-e5462d16f76ad7a9156a82a97fbafba298da9ca6.zip
powerpc/85xx: disable Suspend support if SMP enabled
We currently dont have CPU Hotplug support working on 85xx so we need to disable Suspsend support as it will force enabling of CPU Hotplug. arch/powerpc/kernel/built-in.o: In function `cpu_die': arch/powerpc/kernel/smp.c:702: undefined reference to `start_secondary_resume' make: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-rw-r--r--arch/powerpc/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index b6ff882f695b..8f4d50b0adfa 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -209,7 +209,7 @@ config ARCH_HIBERNATION_POSSIBLE
config ARCH_SUSPEND_POSSIBLE
def_bool y
depends on ADB_PMU || PPC_EFIKA || PPC_LITE5200 || PPC_83xx || \
- PPC_85xx || PPC_86xx || PPC_PSERIES || 44x || 40x
+ (PPC_85xx && !SMP) || PPC_86xx || PPC_PSERIES || 44x || 40x
config PPC_DCR_NATIVE
bool
OpenPOWER on IntegriCloud