V4L/DVB (8108): Fix open/close race in saa7134

[linux-2.6-omap-h63xx.git] / include / asm-arm / page.h

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index a404d2bf0c68b9c0818efc75ca11571133444a77..8e05bdb5f12f555f94c66b8ff1c008c3a3a5cb86 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -10,20 +10,22 @@
 #ifndef _ASMARM_PAGE_H
 #define _ASMARM_PAGE_H
 
-#include <linux/config.h>
-
 /* 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>
 
 /*
@@ -69,6 +71,14 @@
 # endif
 #endif
 
+#ifdef CONFIG_CPU_COPY_FEROCEON
+# ifdef _USER
+#  define MULTI_USER 1
+# else
+#  define _USER feroceon
+# endif
+#endif
+
 #ifdef CONFIG_CPU_SA1100
 # ifdef _USER
 #  define MULTI_USER 1
@@ -169,8 +179,9 @@ typedef unsigned long pgprot_t;
 
 #endif /* STRICT_MM_TYPECHECKS */
 
-/* the upper-most page table pointer */
-extern pmd_t *top_pmd;
+#endif /* CONFIG_MMU */
+
+typedef struct page *pgtable_t;
 
 #include <asm/memory.h>
 
@@ -186,8 +197,6 @@ extern pmd_t *top_pmd;
 #define ARCH_SLAB_MINALIGN 8
 #endif
 
-#endif /* __KERNEL__ */
-
 #include <asm-generic/page.h>
 
 #endif