Comment 7 for bug 959959

Applied to Precise master-next.

Thanks,
Leann

On Tue, 2012-03-20 at 15:27 +0800, Jeremy Kerr wrote:
> From: Benjamin Herrenschmidt <email address hidden>
>
> BugLink: https://bugs.launchpad.net/bugs/959959
>
> 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 <email address hidden>
> Signed-off-by: Jeremy Kerr <email address hidden>
> Reported-By: Adam Conrad <email address hidden>
> Tested-By: Adam Conrad <email address hidden>
>
> Cherry-picked from upstream commit
> 78c5c68a4cf4329d17abfa469345ddf323d4fd62
>
> ---
> arch/powerpc/platforms/powermac/smp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
> index 9b6a820..3394254 100644
> --- a/arch/powerpc/platforms/powermac/smp.c
> +++ b/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)
> {
> - if (cpu_nr != 0)
> + if (cpu_nr != 0 || !psurge_start)
> return;
>
> /* reset the entry point so if we get another intr we won't
>