summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/crash.c
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2011-07-04 20:40:10 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-07-19 15:13:05 +1000
commit63f21a56f1cc0b800a4c00349c59448f82473d19 (patch)
tree441c7cd711b9ab43d6fcb82609b7f294e592b02c /arch/powerpc/kernel/crash.c
parentf7ba2991e9063fa8cf668ee57c08e2842ad04f11 (diff)
downloadop-kernel-dev-63f21a56f1cc0b800a4c00349c59448f82473d19.zip
op-kernel-dev-63f21a56f1cc0b800a4c00349c59448f82473d19.tar.gz
powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
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>
Diffstat (limited to 'arch/powerpc/kernel/crash.c')
-rw-r--r--arch/powerpc/kernel/crash.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 4e6ee94..cc6a9d5 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -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);
}
OpenPOWER on IntegriCloud