[PATCH] powerpc/kdump: Fix timeout in crash_kexec_wait_realmode

Michael Neuling mikey at neuling.org
Tue Jul 5 16:40:10 EST 2011

The existing code it pretty ugly.  How about we clean it up even more
like this?

From: Anton Blanchard <anton at 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 at samba.org>
Signed-off-by: Michael Neuling <mikey at neuling.org>
Cc: <stable at kernel.org>

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) {
-			if (!cpu_possible(i)) {
+			if (!cpu_possible(i) || !cpu_online(i) || (msecs <= 0))
-			}
-			if (!cpu_online(i)) {
-				break;
-			}

More information about the Linuxppc-dev mailing list