From b08a5a544a8df79600644ebacf09a37c04715bb0 Mon Sep 17 00:00:00 2001
From: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Date: Thu, 17 Apr 2008 16:59:52 +0900
Subject: [PATCH] --- yaml --- r: 91903 b: refs/heads/master c:
 284e54279597e0933d785580a43be0b0194dfa00 h: refs/heads/master i:   91901:
 b3cc32d68a3014c56f6b2e0adfbf0a754b642a1b   91899:
 d5a03079e14f6a9d0b4ab54c101b7d94f3183301   91895:
 39eba990adb3be2259a722951cc283c822597e63   91887:
 c972cea5995c4d5c81532e62a1b07b70e2922545   91871:
 843aa71b851a2604e72ba01edb21f16ff6121654   91839:
 02fc839851716f7a2b87f1a8d16c64bac4d0d788   91775:
 8c1bafb635d44832554ca8aaec156acd7690de71   91647:
 1e16c1724abad10851efba1ffe42cac9f60bcf8e v: v3

---
 [refs]                       | 2 +-
 trunk/arch/ia64/kernel/mca.c | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6ed769fc797f..5a27d7bbb713 100644
--- 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
index e51bced3b0fa..3ba091bb20c9 100644
--- 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);