diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-23 12:48:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-23 12:48:17 -0700 |
| commit | ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569 (patch) | |
| tree | 45896aa3ae1071c089f969cdce72d83125ed459a /drivers/xen | |
| parent | f6837bfa6506892e889ec79d8ab29931b4468826 (diff) | |
| parent | ebb9cfe20fe167f29960a5e913193a684fac50bf (diff) | |
| download | op-kernel-dev-ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569.zip op-kernel-dev-ee5c2ab09b79d3aba3515a3eae7c5cf1e2cbc569.tar.gz | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
xen: don't drop NX bit
xen: mask unwanted pte bits in __supported_pte_mask
xen: Use wmb instead of rmb in xen_evtchn_do_upcall().
x86: fix NULL pointer deref in __switch_to
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/events.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 4f0f22b..76e5b73 100644 --- a/drivers/xen/events.c +++ b/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) { |
