diff options
| author | Michael Neuling <mikey@neuling.org> | 2011-07-04 20:40:10 +0000 |
|---|---|---|
| committer | Andi Kleen <ak@linux.intel.com> | 2011-08-01 13:55:01 -0700 |
| commit | 5d9a9233b7fe68dc51ee41a4d35798cfee682444 (patch) | |
| tree | d0d71891d4ab4269fe49f842e065433f2ed1a7f2 | |
| parent | bf807eef020a66ee0597cd7996cf6d8bfb06945d (diff) | |
powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
[ upstream commit 63f21a56f1cc0b800a4c00349c59448f82473d19 ]
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>
Signed-off-by: Andi Kleen <ak@linux.intel.com>
| -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 417f7b05a9ce..8fc58aae9332 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); } |