Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6] / include / asm-x86 / fixmap.h

diff --git a/include/asm-x86/fixmap.h b/include/asm-x86/fixmap.h
index 01b0f98f9929c84f30015b8bc906e87eabc53543..44d4f82173496d2984b9c6612c4d4fe48341a146 100644 (file)
--- a/include/asm-x86/fixmap.h
+++ b/include/asm-x86/fixmap.h
@@ -7,8 +7,20 @@
 # include "fixmap_64.h"
 #endif
 
-extern void __set_fixmap(enum fixed_addresses idx,
-                        unsigned long phys, pgprot_t flags);
+extern int fixmaps_set;
+
+void __native_set_fixmap(enum fixed_addresses idx, pte_t pte);
+void native_set_fixmap(enum fixed_addresses idx,
+                      unsigned long phys, pgprot_t flags);
+
+#ifndef CONFIG_PARAVIRT
+static inline void __set_fixmap(enum fixed_addresses idx,
+                               unsigned long phys, pgprot_t flags)
+{
+       native_set_fixmap(idx, phys, flags);
+}
+#endif
+
 #define set_fixmap(idx, phys)                          \
        __set_fixmap(idx, phys, PAGE_KERNEL)