Commit bff4680d authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Willy Tarreau

powerpc/pmac: Fix SMP kernels on pre-core99 UP machines

commit 78c5c68a upstream.

The code for "powersurge" SMP would kick in and cause a crash
at boot due to the lack of a NULL test.

Adam Conrad reports that the 3.2 kernel, with CONFIG_SMP=y, will not
boot on an OldWorld G3; we're unconditionally writing to psurge_start,
but this is only set on powersurge machines.
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarJeremy Kerr <jeremy.kerr@canonical.com>
Reported-by: default avatarAdam Conrad <adconrad@ubuntu.com>
Tested-by: default avatarAdam Conrad <adconrad@ubuntu.com>
Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
parent 99612d20
......@@ -402,7 +402,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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment