Skip to content

Commit

Permalink
powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
Browse files Browse the repository at this point in the history
commit 78c5c68 upstream.

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>
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Reported-by: Adam Conrad <adconrad@ubuntu.com>
Tested-by: Adam Conrad <adconrad@ubuntu.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Greg Kroah-Hartman committed Mar 23, 2012
1 parent 8290924 commit 029a937
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/powermac/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 029a937

Please sign in to comment.