diff options
| author | Alex Williamson <alex.williamson@hp.com> | 2008-02-14 09:34:27 -0700 |
|---|---|---|
| committer | Alex Williamson <alex.williamson@hp.com> | 2008-02-14 09:34:27 -0700 |
| commit | e38c4f55fe6ef6c393388ae181630ab3a92f77dd (patch) | |
| tree | 24970faea32f21f96b9048f8a36c8e8d9dafe2b2 /tools/ioemu/hw/xenfb.c | |
| parent | 03c9b741df33f676c99c7885ca7f795190df37d5 (diff) | |
| parent | df5b25e9af9248d8e00d0ef7e4ce3eec9eb44f97 (diff) | |
| download | xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.tar.gz xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.tar.bz2 xen-e38c4f55fe6ef6c393388ae181630ab3a92f77dd.zip | |
merge with xen-unstable.hg
Diffstat (limited to 'tools/ioemu/hw/xenfb.c')
| -rw-r--r-- | tools/ioemu/hw/xenfb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/ioemu/hw/xenfb.c b/tools/ioemu/hw/xenfb.c index f0d7f7936e..5418986178 100644 --- a/tools/ioemu/hw/xenfb.c +++ b/tools/ioemu/hw/xenfb.c @@ -485,7 +485,7 @@ static void xenfb_on_fb_event(struct xenfb *xenfb) prod = page->out_prod; if (prod == page->out_cons) return; - rmb(); /* ensure we see ring contents up to prod */ + xen_rmb(); /* ensure we see ring contents up to prod */ for (cons = page->out_cons; cons != prod; cons++) { union xenfb_out_event *event = &XENFB_OUT_RING_REF(page, cons); int x, y, w, h; @@ -512,7 +512,7 @@ static void xenfb_on_fb_event(struct xenfb *xenfb) break; } } - mb(); /* ensure we're done with ring contents */ + xen_mb(); /* ensure we're done with ring contents */ page->out_cons = cons; xc_evtchn_notify(xenfb->evt_xch, xenfb->fb.port); } @@ -571,9 +571,9 @@ static int xenfb_kbd_event(struct xenfb *xenfb, return -1; } - mb(); /* ensure ring space available */ + xen_mb(); /* ensure ring space available */ XENKBD_IN_RING_REF(page, prod) = *event; - wmb(); /* ensure ring contents visible */ + xen_wmb(); /* ensure ring contents visible */ page->in_prod = prod + 1; return xc_evtchn_notify(xenfb->evt_xch, xenfb->kbd.port); } |