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

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index 85f35e67020ff5c15317727a2387feb780400797..e3a552fa5538744bd578d6351c8c23756774c782 100644 (file)
--- 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
index b59f33e6b838eb99616d361a98aa6aa951ae23cd..f7bf875aae4050d322c5ed15893be6a1537f76ba 100644 (file)
--- 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 */