Merge branch 'sched/new-API-sched_setscheduler' of git://git.kernel.org/pub/scm/linux...

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

diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h
index 31ff12f4ffb7b5fdb757767a159c4f855c544630..8e05bdb5f12f555f94c66b8ff1c008c3a3a5cb86 100644 (file)
--- a/include/asm-arm/page.h
+++ b/include/asm-arm/page.h
@@ -71,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
@@ -173,6 +181,8 @@ typedef unsigned long pgprot_t;
 
 #endif /* CONFIG_MMU */
 
+typedef struct page *pgtable_t;
+
 #include <asm/memory.h>
 
 #endif /* !__ASSEMBLY__ */