From f572d57247952abdd8af430a7a435bdcc35dae01 Mon Sep 17 00:00:00 2001
From: Milton Miller <miltonm@bga.com>
Date: Fri, 10 Oct 2008 01:56:44 +0000
Subject: [PATCH] --- yaml --- r: 114623 b: refs/heads/master c:
 199f45c45e8d4f58a5f568464be933534460eb82 h: refs/heads/master i:   114621:
 9dfa784c339f02f8dad6fbf3702db0e0f51834e4   114619:
 81416f29d063bf65cd76190debbf637cfb7d7309   114615:
 a4fb5644e28427391bc5e1c3711f81b19ac4232a   114607:
 fffd78365b20c7cdc7995bcdfdecab96f09584a0   114591:
 b38f4dfeec726033e488eedbd3202098d7fc9ebf   114559:
 f2bec94fbb81fa5e9e86144bae0f12f1ca19c2b9 v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/powerpc/platforms/pseries/xics.c | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 8e558eefda46..d6f30e249d7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2172fe8704a1df7cbb988ae1ec4edbfef3e28860
+refs/heads/master: 199f45c45e8d4f58a5f568464be933534460eb82
diff --git a/trunk/arch/powerpc/platforms/pseries/xics.c b/trunk/arch/powerpc/platforms/pseries/xics.c
index 62b0400577de..e1904774a70f 100644
--- a/trunk/arch/powerpc/platforms/pseries/xics.c
+++ b/trunk/arch/powerpc/platforms/pseries/xics.c
@@ -498,26 +498,23 @@ static irqreturn_t xics_ipi_dispatch(int cpu)
 {
 	WARN_ON(cpu_is_offline(cpu));
 
+	mb();	/* order mmio clearing qirr */
 	while (xics_ipi_message[cpu].value) {
 		if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION,
 				       &xics_ipi_message[cpu].value)) {
-			mb();
 			smp_message_recv(PPC_MSG_CALL_FUNCTION);
 		}
 		if (test_and_clear_bit(PPC_MSG_RESCHEDULE,
 				       &xics_ipi_message[cpu].value)) {
-			mb();
 			smp_message_recv(PPC_MSG_RESCHEDULE);
 		}
 		if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,
 				       &xics_ipi_message[cpu].value)) {
-			mb();
 			smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
 		}
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 		if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,
 				       &xics_ipi_message[cpu].value)) {
-			mb();
 			smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
 		}
 #endif