Skip to content

Commit

Permalink
powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
Browse files Browse the repository at this point in the history
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>
Cc: <stable@kernel.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Michael Neuling authored and Benjamin Herrenschmidt committed Jul 19, 2011
1 parent f7ba299 commit 63f21a5
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions arch/powerpc/kernel/crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -242,12 +242,8 @@ static void crash_kexec_wait_realmode(int cpu)

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);
}
Expand Down

0 comments on commit 63f21a5

Please sign in to comment.