Module Name: src
Committed By: cegger
Date: Wed Dec 7 15:40:15 UTC 2011
Modified Files:
src/sys/arch/xen/include/xen-public/io: ring.h
Log Message:
merge. (forgot in previous)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/arch/xen/include/xen-public/io/ring.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/include/xen-public/io/ring.h
diff -u src/sys/arch/xen/include/xen-public/io/ring.h:1.1.1.2 src/sys/arch/xen/include/xen-public/io/ring.h:1.2
--- src/sys/arch/xen/include/xen-public/io/ring.h:1.1.1.2 Wed Dec 7 14:41:16 2011
+++ src/sys/arch/xen/include/xen-public/io/ring.h Wed Dec 7 15:40:15 2011
@@ -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;
