浏览代码

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>
Benjamin Herrenschmidt 13 年之前
父节点
当前提交
78c5c68a4c
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      arch/powerpc/platforms/powermac/smp.c

+ 1 - 1
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)
 static void __init smp_psurge_setup_cpu(int cpu_nr)
 {
 {
-	if (cpu_nr != 0)
+	if (cpu_nr != 0 || !psurge_start)
 		return;
 		return;
 
 
 	/* reset the entry point so if we get another intr we won't
 	/* reset the entry point so if we get another intr we won't