diff --git a/[refs] b/[refs] index f499bbb630a9..b915190db108 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54481cf88bc59923ea30f2ca345a73c60155e901 +refs/heads/master: 46539383791a0e59a4af7412056dfbfc5240af0a diff --git a/trunk/drivers/xen/events.c b/trunk/drivers/xen/events.c index 4f0f22b020ea..76e5b7386af9 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) {