---

yaml --- r: 91903 b: refs/heads/master c: 284e542 h: refs/heads/master i: 91901: b3cc32d 91899: d5a0307 91895: 39eba99 91887: c972cea 91871: 843aa71 91839: 02fc839 91775: 8c1bafb 91647: 1e16c17 v: v3
git-mirror · Apr 22, 2008 · b08a5a5 · b08a5a5
1 parent c0c4443
commit b08a5a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38477ad75188b2a7370fef7145f956e6c446928b
+refs/heads/master: 284e54279597e0933d785580a43be0b0194dfa00
diff --git a/trunk/arch/ia64/kernel/mca.c b/trunk/arch/ia64/kernel/mca.c
@@ -1288,13 +1288,14 @@ ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
 		 * does not work.
 		 */
 		ia64_mca_wakeup_all();
-		if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, (long)&nd, 0, 0)
-				== NOTIFY_STOP)
-			ia64_mca_spin(__func__);
 	} else {
 		while (cpu_isset(cpu, mca_cpu))
 			cpu_relax();	/* spin until monarch wakes us */
-        }
+	}
+
+	if (notify_die(DIE_MCA_MONARCH_PROCESS, "MCA", regs, (long)&nd, 0, 0)
+			== NOTIFY_STOP)
+		ia64_mca_spin(__func__);
 
 	/* Get the MCA error record and log it */
 	ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);