summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ds <srinivasa@in.ibm.com>2006-10-18 17:34:49 +0530
committerPaul Mackerras <paulus@samba.org>2006-10-23 18:23:17 +1000
commit7f8c4c50bda13d27afc03679d25aa1fcac8df551 (patch)
tree5156c0f852c40293800ff30b8521900577581c13
parentc3386e40142e9d0c077460c2a548c4653fecaf15 (diff)
[POWERPC] Fix build breakage with CONFIG_PPC32
low_cpu_die is called from the CPU hotplug code on 32-bit powermacs, but it is only defined if CONFIG_PM || CONFIG_CPU_FREQ_PMAC. This changes the ifdef so it is defined for CONFIG_HOTPLUG_CPU on 32-bit machines. Signed-off-by: Srinivasa DS <srinivasa@in.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/platforms/powermac/sleep.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/sleep.S b/arch/powerpc/platforms/powermac/sleep.S
index 1174ca128ef..adee28da353 100644
--- a/arch/powerpc/platforms/powermac/sleep.S
+++ b/arch/powerpc/platforms/powermac/sleep.S
@@ -45,7 +45,8 @@
.section .text
.align 5
-#if defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ_PMAC)
+#if defined(CONFIG_PM) || defined(CONFIG_CPU_FREQ_PMAC) || \
+ (defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PPC32))
/* This gets called by via-pmu.c late during the sleep process.
* The PMU was already send the sleep command and will shut us down