[src/trunk]: src/sys/arch/xen/include/xen-public/io merge. (forgot in previous)

[cegger <cegger%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/18075f005fa3
branches:  trunk
changeset: 771901:18075f005fa3
user:      cegger <cegger%NetBSD.org@localhost>
date:      Wed Dec 07 15:40:15 2011 +0000

description:
merge. (forgot in previous)

diffstat:

 sys/arch/xen/include/xen-public/io/ring.h |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (28 lines):

diff -r a63d1139ccf1 -r 18075f005fa3 sys/arch/xen/include/xen-public/io/ring.h
--- a/sys/arch/xen/include/xen-public/io/ring.h Wed Dec 07 15:04:18 2011 +0000
+++ b/sys/arch/xen/include/xen-public/io/ring.h Wed Dec 07 15:40:15 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ring.h,v 1.1.1.2 2011/12/07 14:41:16 cegger Exp $ */
+/* $NetBSD: ring.h,v 1.2 2011/12/07 15:40:15 cegger Exp $ */
 /******************************************************************************
  * ring.h
  * 
@@ -31,10 +31,18 @@
 #include "../xen-compat.h"
 
 #if __XEN_INTERFACE_VERSION__ < 0x00030208
+#if defined(__Linux__)
 #define xen_mb()  mb()
 #define xen_rmb() rmb()
 #define xen_wmb() wmb()
 #endif
+#endif
+
+#if defined(__NetBSD__)
+#define xen_mb()  x86_mfence()
+#define xen_rmb() x86_lfence()
+#define xen_wmb() x86_sfence()
+#endif
 
 typedef unsigned int RING_IDX;