Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / asm-x86_64 / mach-xen / asm / pgalloc.h

diff --git a/include/asm-x86_64/mach-xen/asm/pgalloc.h b/include/asm-x86_64/mach-xen/asm/pgalloc.h
index e97b532..e0126be 100644 (file)
--- a/include/asm-x86_64/mach-xen/asm/pgalloc.h
+++ b/include/asm-x86_64/mach-xen/asm/pgalloc.h
@@ -7,6 +7,8 @@
 #include <linux/mm.h>
 #include <asm/io.h>            /* for phys_to_virt and page_to_pseudophys */
 
+#include <xen/features.h>
+
 #define arch_add_exec_range(mm, limit) \
                do { (void)(mm), (void)(limit); } while (0)
 #define arch_flush_exec_range(mm) \
@@ -14,7 +16,6 @@
 #define arch_remove_exec_range(mm, limit) \
                do { (void)(mm), (void)(limit); } while (0)
 
-#include <xen/features.h>
 void make_page_readonly(void *va, unsigned int feature);
 void make_page_writable(void *va, unsigned int feature);
 void make_pages_readonly(void *va, unsigned int nr, unsigned int feature);