diff options
| author | Michael Neuling <mikey@neuling.org> | 2011-07-04 20:40:10 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 10:35:58 -0700 |
| commit | c3f379d612a3ef1d1158a7afaab16758a222bc73 (patch) | |
| tree | 596acd0c68504fe1e8b88fe98d259f0d6fa7d490 | |
| parent | ff8891a7853c091791b4a006850ae07d9b55c7cb (diff) | |
| download | lwn-c3f379d612a3ef1d1158a7afaab16758a222bc73.tar.gz lwn-c3f379d612a3ef1d1158a7afaab16758a222bc73.zip | |
powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
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>
| -rw-r--r-- | arch/powerpc/kernel/crash.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c index 29df48f2b61a..23cbddc0e7f4 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -176,12 +176,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); } |