diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-08 23:06:18 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:10:25 -0500 |
| commit | 78c5c68a4cf4329d17abfa469345ddf323d4fd62 (patch) | |
| tree | b83bf1b2fd8eea15e6c7d0cfc8d485445b7c6558 /arch/powerpc/platforms/powermac/smp.c | |
| parent | 8e609d5e7bc032ab220d47c841c992bd8544d0e1 (diff) | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c index e6f7378f4a4..44d769258eb 100644 --- a/arch/powerpc/platforms/powermac/smp.c +++ b/arch/powerpc/platforms/powermac/smp.c | |||
| @@ -414,7 +414,7 @@ static struct irqaction psurge_irqaction = { | |||
| 414 | 414 | ||
| 415 | static void __init smp_psurge_setup_cpu(int cpu_nr) | 415 | static void __init smp_psurge_setup_cpu(int cpu_nr) |
| 416 | { | 416 | { |
| 417 | if (cpu_nr != 0) | 417 | if (cpu_nr != 0 || !psurge_start) |
| 418 | return; | 418 | return; |
| 419 | 419 | ||
| 420 | /* reset the entry point so if we get another intr we won't | 420 | /* reset the entry point so if we get another intr we won't |