2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Michael Neuling <[email protected]> [ upstream commit 63f21a56f1cc0b800a4c00349c59448f82473d19 ] The existing code it pretty ugly. How about we clean it up even more like this? From: Anton Blanchard <[email protected]> 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 <[email protected]> Signed-off-by: Michael Neuling <[email protected]> Cc: <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Andi Kleen <[email protected]> Index: linux-2.6.35.y/arch/powerpc/kernel/crash.c =================================================================== --- linux-2.6.35.y.orig/arch/powerpc/kernel/crash.c +++ linux-2.6.35.y/arch/powerpc/kernel/crash.c @@ -176,12 +176,8 @@ static void crash_kexec_wait_realmode(in 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); } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
