aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMichael Neuling <mikey@neuling.org>2011-07-04 20:40:10 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-04 21:58:37 -0700
commit4a3422bb0a18340c145ebd3f3ca19d1114f9fa08 (patch)
tree30cc0d94c42fb2c3feb605d874bf7fff6b371e79 /arch/powerpc
parent758705e242a729b0c82c62dd5965189e318e8763 (diff)
downloadkernel_samsung_tuna-4a3422bb0a18340c145ebd3f3ca19d1114f9fa08.zip
kernel_samsung_tuna-4a3422bb0a18340c145ebd3f3ca19d1114f9fa08.tar.gz
kernel_samsung_tuna-4a3422bb0a18340c145ebd3f3ca19d1114f9fa08.tar.bz2
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>
Diffstat (limited to 'arch/powerpc')
-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);
}