lkml.org 
[lkml]   [2011]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 147/173] powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
    2.6.27.59-stable review patch.  If anyone has any objections, please let us know.

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

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

    powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code

    This patch introduces PPC64 specific #ifdef bits from the upstream
    commit: b3df895aebe091b1657a42a8c859bd49fc96646b.

    Reported-and-tested-by: dann frazier <dannf@dannf.org>
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
    cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    cc: Anton Blanchard <anton@samba.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/powerpc/kernel/crash.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/arch/powerpc/kernel/crash.c
    +++ b/arch/powerpc/kernel/crash.c
    @@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int
    }

    /* wait for all the CPUs to hit real mode but timeout if they don't come in */
    +#ifdef CONFIG_PPC_STD_MMU_64
    static void crash_kexec_wait_realmode(int cpu)
    {
    unsigned int msecs;
    @@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(in
    }
    mb();
    }
    +#endif

    /*
    * This function will be called by secondary cpus or by kexec cpu
    @@ -445,7 +447,9 @@ 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
    crash_kexec_wait_realmode(crashing_cpu);
    +#endif
    if (ppc_md.kexec_cpu_down)
    ppc_md.kexec_cpu_down(1, 0);
    }



    \
     
     \ /
      Last update: 2011-04-25 22:31    [W:0.035 / U:34.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site