lkml.org 
[lkml]   [2011]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[56/71] powerpc: Fix default_machine_crash_shutdown #ifdef botch
    2.6.33-longterm review patch.  If anyone has any objections, please let us know.

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

    From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>

    powerpc: Fix default_machine_crash_shutdown #ifdef botch

    Commit: c2be05481f6125254c45b78f334d4dd09c701c82 upstream

    crash_kexec_wait_realmode() is defined only if CONFIG_PPC_STD_MMU_64
    and CONFIG_SMP, but is called if CONFIG_PPC_STD_MMU_64 even if !CONFIG_SMP.
    Fix the conditional compilation around the invocation.

    Reported-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Acked-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    cc: Anton Blanchard <anton@samba.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/powerpc/kernel/crash.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/powerpc/kernel/crash.c
    +++ b/arch/powerpc/kernel/crash.c
    @@ -447,7 +447,7 @@ void default_machine_crash_shutdown(stru
    crash_kexec_prepare_cpus(crashing_cpu);
    cpu_set(crashing_cpu, cpus_in_crash);
    crash_kexec_stop_spus();
    -#ifdef CONFIG_PPC_STD_MMU_64
    +#if defined(CONFIG_PPC_STD_MMU_64) && defined(CONFIG_SMP)
    crash_kexec_wait_realmode(crashing_cpu);
    #endif
    if (ppc_md.kexec_cpu_down)



    \
     
     \ /
      Last update: 2011-04-13 18:17    [W:0.018 / U:2.740 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site