]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 9 Dec 2011 04:06:18 +0000 (15:06 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 16 Dec 2011 00:10:25 +0000 (11:10 +1100)
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>
arch/powerpc/platforms/powermac/smp.c

index e6f7378f4a49240720d2a1ce5aebbd043af6ef10..44d769258ebf08d1b5ba40641b4687827f1c32d0 100644 (file)
@@ -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