lkml.org 
[lkml]   [2012]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 8/8] powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Benjamin Herrenschmidt <benh@kernel.crashing.org>

    commit 78c5c68a4cf4329d17abfa469345ddf323d4fd62 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>

    ---
    arch/powerpc/platforms/powermac/smp.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- 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



    \
     
     \ /
      Last update: 2012-03-21 22:19    [W:0.021 / U:0.312 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site