---

yaml --- r: 259156 b: refs/heads/master c: 63f21a5 h: refs/heads/master v: v3
git-mirror · Jul 19, 2011 · 11f29ce · 11f29ce
1 parent 7a78af7
commit 11f29ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7ba2991e9063fa8cf668ee57c08e2842ad04f11
+refs/heads/master: 63f21a56f1cc0b800a4c00349c59448f82473d19
diff --git a/trunk/arch/powerpc/kernel/crash.c b/trunk/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);
 		}