X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-arm%2Fpage.h;h=45be829fe44cb936029cf4229105259ae3a9c37e;hb=refs%2Fheads%2Fvserver;hp=dfa9475851c85c18e04a77f6aeef806a93130a11;hpb=43bc926fffd92024b46cafaf7350d669ba9ca884;p=linux-2.6.git

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index dfa947585..45be829fe 100644
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -10,20 +10,25 @@
 #ifndef _ASMARM_PAGE_H
 #define _ASMARM_PAGE_H
 
-#include <linux/config.h>
+
+#ifdef __KERNEL__
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT		12
 #define PAGE_SIZE		(1UL << PAGE_SHIFT)
 #define PAGE_MASK		(~(PAGE_SIZE-1))
 
-#ifdef __KERNEL__
-
 /* to align the pointer to the (next) page boundary */
 #define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
 
 #ifndef __ASSEMBLY__
 
+#ifndef CONFIG_MMU
+
+#include "page-nommu.h"
+
+#else
+
 #include <asm/glue.h>
 
 /*
@@ -169,8 +174,7 @@ typedef unsigned long pgprot_t;
 
 #endif /* STRICT_MM_TYPECHECKS */
 
-/* the upper-most page table pointer */
-extern pmd_t *top_pmd;
+#endif /* CONFIG_MMU */
 
 #include <asm/memory.h>
 
@@ -186,10 +190,10 @@ extern pmd_t *top_pmd;
 #define ARCH_SLAB_MINALIGN 8
 #endif
 
+#include <asm-generic/page.h>
+
 #define devmem_is_allowed(x) 1
 
 #endif /* __KERNEL__ */
 
-#include <asm-generic/page.h>
-
 #endif