lkml.org 
[lkml]   [2011]   [Aug]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[058/102] powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
    3.0-stable review patch.  If anyone has any objections, please let us know.

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

    From: Michael Neuling <mikey@neuling.org>

    commit 63f21a56f1cc0b800a4c00349c59448f82473d19 upstream.

    The existing code it pretty ugly. How about we clean it up even more
    like this?

    From: Anton Blanchard <anton@samba.org>

    We check for timeout expiry in the outer loop, but we also need to
    check it in the inner loop or we can lock up forever waiting for a
    CPU to hit real mode.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/powerpc/kernel/crash.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    --- a/arch/powerpc/kernel/crash.c
    +++ b/arch/powerpc/kernel/crash.c
    @@ -242,12 +242,8 @@ static void crash_kexec_wait_realmode(in

    while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {
    barrier();
    - if (!cpu_possible(i)) {
    + if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0))
    break;
    - }
    - if (!cpu_online(i)) {
    - break;
    - }
    msecs--;
    mdelay(1);
    }



    \
     
     \ /
      Last update: 2011-08-04 01:33    [W:0.019 / U:150.924 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site