From 9ee54b362b14ea64e67f520b83c436480a6ce174 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 27 Apr 2006 15:48:08 +0100
Subject: [PATCH] --- yaml --- r: 27978 b: refs/heads/master c:
 cd469e0cc67b74ba41daec335ea72baedb750b80 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/asm-i386/page.h   | 4 ++--
 trunk/include/asm-x86_64/page.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 581258b5e14e..e1ef2d100daf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad1588798620901c12ba86c71865150a4eb727bf
+refs/heads/master: cd469e0cc67b74ba41daec335ea72baedb750b80
diff --git a/trunk/include/asm-i386/page.h b/trunk/include/asm-i386/page.h
index 85f35e67020f..e3a552fa5538 100644
--- a/trunk/include/asm-i386/page.h
+++ b/trunk/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/trunk/include/asm-x86_64/page.h b/trunk/include/asm-x86_64/page.h
index b59f33e6b838..f7bf875aae40 100644
--- a/trunk/include/asm-x86_64/page.h
+++ b/trunk/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 */