summaryrefslogtreecommitdiffstats
path: root/sys/i386/include/xen/xen-os.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/i386/include/xen/xen-os.h')
-rw-r--r--sys/i386/include/xen/xen-os.h27
1 files changed, 19 insertions, 8 deletions
diff --git a/sys/i386/include/xen/xen-os.h b/sys/i386/include/xen/xen-os.h
index e90109d..257202e 100644
--- a/sys/i386/include/xen/xen-os.h
+++ b/sys/i386/include/xen/xen-os.h
@@ -12,16 +12,21 @@
#define CONFIG_X86_PAE
#endif
+#ifdef LOCORE
+#define __ASSEMBLY__
+#endif
+
#if !defined(__XEN_INTERFACE_VERSION__)
-/*
- * Can update to a more recent version when we implement
- * the hypercall page
- */
-#define __XEN_INTERFACE_VERSION__ 0x00030204
+#define __XEN_INTERFACE_VERSION__ 0x00030208
#endif
+#define GRANT_REF_INVALID 0xffffffff
+
#include <xen/interface/xen.h>
+/* Everything below this point is not included by assembler (.S) files. */
+#ifndef __ASSEMBLY__
+
/* Force a proper event-channel callback from Xen. */
void force_evtchn_callback(void);
@@ -85,9 +90,6 @@ static inline void rep_nop(void)
void *bootmem_alloc(unsigned int size);
void bootmem_free(void *ptr, unsigned int size);
-
-/* Everything below this point is not included by assembler (.S) files. */
-#ifndef __ASSEMBLY__
#include <sys/types.h>
void printk(const char *fmt, ...);
@@ -168,6 +170,15 @@ do { \
#endif
+#ifndef xen_mb
+#define xen_mb() mb()
+#endif
+#ifndef xen_rmb
+#define xen_rmb() rmb()
+#endif
+#ifndef xen_wmb
+#define xen_wmb() wmb()
+#endif
#ifdef SMP
#define smp_mb() mb()
#define smp_rmb() rmb()
OpenPOWER on IntegriCloud