Compile fixes for xen build.

MFC after:	1 month.

2 files changed, 20 insertions, 8 deletions

diff --git a/sys/i386/include/xen/xen-os.h b/sys/i386/include/xen/xen-os.h
index f325d35..92ba5e7 100644
--- a/sys/i386/include/xen/xen-os.h
+++ b/sys/i386/include/xen/xen-os.h
@@ -7,23 +7,41 @@
 #ifndef _XEN_OS_H_
 #define _XEN_OS_H_
 #include <machine/param.h>
+
 #ifdef PAE
 #define CONFIG_X86_PAE
 #endif
 
+#if defined(XEN) && !defined(__XEN_INTERFACE_VERSION__) 
+/* 
+ * Can update to a more recent version when we implement 
+ * the hypercall page 
+ */ 
+#define  __XEN_INTERFACE_VERSION__ 0x00030204 
+#endif 
+
 #include <xen/interface/xen.h>
 
 /* Force a proper event-channel callback from Xen. */
 void force_evtchn_callback(void);
 
+#define likely(x)  __builtin_expect((x),1)
+#define unlikely(x)  __builtin_expect((x),0)
+
+#ifndef vtophys
+#include <vm/vm.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#endif
+
 #ifdef SMP
 #include <sys/time.h> /* XXX for pcpu.h */
 #include <sys/pcpu.h> /* XXX for PCPU_GET */
-extern int gdt_set;
+extern int gdtset;
 static inline int 
 smp_processor_id(void)  
 {
-    if (likely(gdt_set))
+    if (likely(gdtset))
 	return PCPU_GET(cpuid);
     return 0;
 }
@@ -92,9 +110,6 @@ extern int preemptable;
  * the enable bit is set, there may be pending events to be handled.
  * We may therefore call into do_hypervisor_callback() directly.
  */
-#define likely(x)  __builtin_expect((x),1)
-#define unlikely(x)  __builtin_expect((x),0)
-
 
 
 #define __cli()                                                         \
diff --git a/sys/i386/include/xen/xenpmap.h b/sys/i386/include/xen/xenpmap.h
index 163b780..62197a4 100644
--- a/sys/i386/include/xen/xenpmap.h
+++ b/sys/i386/include/xen/xenpmap.h
@@ -35,12 +35,9 @@
 
 #ifndef _XEN_XENPMAP_H_
 #define _XEN_XENPMAP_H_
-void xen_invlpg(vm_offset_t);
-void xen_load_cr3(vm_paddr_t);
 void _xen_queue_pt_update(vm_paddr_t, vm_paddr_t, char *, int);
 void xen_pt_switch(vm_paddr_t);
 void xen_set_ldt(vm_paddr_t, unsigned long);
-void xen_tlb_flush(void);
 void xen_pgdpt_pin(vm_paddr_t);
 void xen_pgd_pin(vm_paddr_t);
 void xen_pgd_unpin(vm_paddr_t);