summaryrefslogtreecommitdiffstats
path: root/include/asm-x86_64/page.h
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-04-27 15:48:08 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-04-27 15:48:08 +0100
commitcd469e0cc67b74ba41daec335ea72baedb750b80 (patch)
tree8054cc6b13f48785165af1485a873dd3e33d4ca6 /include/asm-x86_64/page.h
parentad1588798620901c12ba86c71865150a4eb727bf (diff)
Exclude asm-generic/{page,memory_model}.h from user bits of i386/x86_64 page.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/asm-x86_64/page.h')
-rw-r--r--include/asm-x86_64/page.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
index b59f33e6b83..f7bf875aae4 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 */