diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-02-12 11:37:45 +0000 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-02-12 11:37:45 +0000 |
| commit | 67bfbd67d1311a1a590b47e568a07622d4492873 (patch) | |
| tree | 17fb757a0b4179d91042dcb8bf3fdb3859925fba /tools/console | |
| parent | b3a389fdfc3a1fe19fd7094b0180e97d49c186dd (diff) | |
| download | xen-67bfbd67d1311a1a590b47e568a07622d4492873.tar.gz xen-67bfbd67d1311a1a590b47e568a07622d4492873.tar.bz2 xen-67bfbd67d1311a1a590b47e568a07622d4492873.zip | |
libxenctrl headers should not pollute macro namespace with
mb/rmb/wmb. Instead add a xen_ prefix. Modify Xen's public headers to
expect the prefixed names instead of bare mb/rmb/wmb, but gate this
expectation on a bump of __XEN_INTERFACE_VERSION__.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/console')
| -rw-r--r-- | tools/console/daemon/io.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/console/daemon/io.c b/tools/console/daemon/io.c index 52df19ed34..9573333c08 100644 --- a/tools/console/daemon/io.c +++ b/tools/console/daemon/io.c @@ -153,7 +153,7 @@ static void buffer_append(struct domain *dom) cons = intf->out_cons; prod = intf->out_prod; - mb(); + xen_mb(); size = prod - cons; if ((size == 0) || (size > sizeof(intf->out))) @@ -172,7 +172,7 @@ static void buffer_append(struct domain *dom) buffer->data[buffer->size++] = intf->out[ MASK_XENCONS_IDX(cons++, intf->out)]; - mb(); + xen_mb(); intf->out_cons = cons; xc_evtchn_notify(dom->xce_handle, dom->local_port); @@ -750,7 +750,7 @@ static int ring_free_bytes(struct domain *dom) cons = intf->in_cons; prod = intf->in_prod; - mb(); + xen_mb(); space = prod - cons; if (space > sizeof(intf->in)) @@ -797,7 +797,7 @@ static void handle_tty_read(struct domain *dom) intf->in[MASK_XENCONS_IDX(prod++, intf->in)] = msg[i]; } - wmb(); + xen_wmb(); intf->in_prod = prod; xc_evtchn_notify(dom->xce_handle, dom->local_port); } else { |