X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-i386%2Fmach-xen%2Fasm%2Ftlbflush.h;h=eacd52dbf198a2e4448d8aa41c7d5c714d40df98;hb=refs%2Fheads%2Fvserver;hp=4d13a650a2de88a564dd1df6ed10a7366becd4e4;hpb=1db395853d4f30d6120458bd279ede1f882a8525;p=linux-2.6.git

diff --git a/include/asm-i386/mach-xen/asm/tlbflush.h b/include/asm-i386/mach-xen/asm/tlbflush.h
index 4d13a650a..eacd52dbf 100644
--- a/include/asm-i386/mach-xen/asm/tlbflush.h
+++ b/include/asm-i386/mach-xen/asm/tlbflush.h
@@ -1,20 +1,24 @@
 #ifndef _I386_TLBFLUSH_H
 #define _I386_TLBFLUSH_H
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <asm/processor.h>
 
-#define __flush_tlb() xen_tlb_flush()
-#define __flush_tlb_global() xen_tlb_flush()
-#define __flush_tlb_all() xen_tlb_flush()
+#ifdef CONFIG_PARAVIRT
+#include <asm/paravirt.h>
+#else
+#define __flush_tlb() __native_flush_tlb()
+#define __flush_tlb_global() __native_flush_tlb_global()
+#define __flush_tlb_single(addr) __native_flush_tlb_single(addr)
+#endif
 
-extern unsigned long pgkern_mask;
+#define __native_flush_tlb() xen_tlb_flush()
+#define __native_flush_tlb_global() xen_tlb_flush()
+#define __native_flush_tlb_single(addr) xen_invlpg(addr)
+#define __flush_tlb_all() xen_tlb_flush()
 
 #define cpu_has_invlpg	(boot_cpu_data.x86 > 3)
 
-#define __flush_tlb_single(addr) xen_invlpg(addr)
-
 #define __flush_tlb_one(addr) __flush_tlb_single(addr)
 
 /*