Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_…

…64 page.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>
git-mirror · Apr 27, 2006 · cd469e0 · cd469e0
1 parent ad15887
commit cd469e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
@@ -136,9 +136,9 @@ extern int page_is_ram(unsigned long pagenr);
 	((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
 		 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
+
 #endif /* _I386_PAGE_H */
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
@@ -135,9 +135,9 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define __HAVE_ARCH_GATE_AREA 1	
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
+#endif /* __KERNEL__ */
+
 #endif /* _X86_64_PAGE_H */