aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/powermac/smp.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-09 15:06:18 +1100
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-12-16 11:10:25 +1100
commit78c5c68a4cf4329d17abfa469345ddf323d4fd62 (patch)
treeb83bf1b2fd8eea15e6c7d0cfc8d485445b7c6558 /arch/powerpc/platforms/powermac/smp.c
parent8e609d5e7bc032ab220d47c841c992bd8544d0e1 (diff)
downloadkernel_goldelico_gta04-78c5c68a4cf4329d17abfa469345ddf323d4fd62.zip
kernel_goldelico_gta04-78c5c68a4cf4329d17abfa469345ddf323d4fd62.tar.gz
kernel_goldelico_gta04-78c5c68a4cf4329d17abfa469345ddf323d4fd62.tar.bz2
powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
The code for "powersurge" SMP would kick in and cause a crash at boot due to the lack of a NULL test. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/powermac/smp.c')
-rw-r--r--arch/powerpc/platforms/powermac/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index e6f7378..44d7692 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -414,7 +414,7 @@ static struct irqaction psurge_irqaction = {
static void __init smp_psurge_setup_cpu(int cpu_nr)
{
- if (cpu_nr != 0)
+ if (cpu_nr != 0 || !psurge_start)
return;
/* reset the entry point so if we get another intr we won't