From b1a188a84be5a4456ffd68ebd3042e36c19351c6 Mon Sep 17 00:00:00 2001
From: Isaku Yamahata <yamahata@valinux.co.jp>
Date: Mon, 16 Jun 2008 14:58:13 -0700
Subject: [PATCH] --- yaml --- r: 99570 b: refs/heads/master c:
 6673cf63e5d973db5145d1f48b354efcb9fe2a13 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/xen/events.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8413c5bd3fc7..09ac9593b802 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 688d22e23ab1caacb2c36c615854294b58f2ea47
+refs/heads/master: 6673cf63e5d973db5145d1f48b354efcb9fe2a13
diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c
index 73d78dc9b875..332dd63750a0 100644
--- a/trunk/drivers/xen/events.c
+++ b/trunk/drivers/xen/events.c
@@ -529,7 +529,7 @@ void xen_evtchn_do_upcall(struct pt_regs *regs)
 
 #ifndef CONFIG_X86 /* No need for a barrier -- XCHG is a barrier on x86. */
 		/* Clear master flag /before/ clearing selector flag. */
-		rmb();
+		wmb();
 #endif
 		pending_words = xchg(&vcpu_info->evtchn_pending_sel, 0);
 		while (pending_words != 0) {