Merge branch 'upstream' into for-linus

[karo-tx-linux.git] / arch / powerpc / kernel / crash.c

diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 4e6ee944495a302b668362c7e958a642c60a8b8b..cc6a9d5d69ab08da9a87635c342f83d0083db8f3 100644 (file)
--- 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);
                }