From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 27 Apr 2006 14:48:08 +0000 (+0100)
Subject: Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h
X-Git-Tag: v2.6.18-rc1~1103^2~34
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd469e0cc67b74ba41daec335ea72baedb750b80;p=linux-2.6

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 85f35e6702..e3a552fa55 100644
--- 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 b59f33e6b8..f7bf875aae 100644
--- 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 */