Applied to Precise master-next.

Thanks,
Leann

On Tue, 2012-03-20 at 15:27 +0800, Jeremy Kerr wrote:
> From: Benjamin Herrenschmidt <b...@kernel.crashing.org>
> 
> 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 <b...@kernel.crashing.org>
> Signed-off-by: Jeremy Kerr <jeremy.k...@canonical.com>
> Reported-By: Adam Conrad <adcon...@ubuntu.com>
> Tested-By: Adam Conrad <adcon...@ubuntu.com>
> 
> 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
>

-- 
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/959959

Title:
  powerpc-smp kernel flavour does not boot on OldWorld G3

To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/959959/+subscriptions

-- 
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs

Reply via email to