X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-arm%2Fpage.h;h=5c22b01121069751e2ed73049ec6d37ae54a18c9;hb=2a5f2e3e6cd1ce9fb3f8b186b6bc9aa1f1497a92;hp=b721270b9986c15d6dca566ec4d0dc65b6cb2e9d;hpb=23b6b0e3e8306ce3d00e0c87196bfaad335b9096;p=linux-2.6 diff --git a/include/asm-arm/page.h b/include/asm-arm/page.h index b721270b99..5c22b01121 100644 --- a/include/asm-arm/page.h +++ b/include/asm-arm/page.h @@ -10,14 +10,11 @@ #ifndef _ASMARM_PAGE_H #define _ASMARM_PAGE_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) @@ -74,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 @@ -174,8 +179,7 @@ typedef unsigned long pgprot_t; #endif /* STRICT_MM_TYPECHECKS */ -/* the upper-most page table pointer */ -extern pmd_t *top_pmd; +typedef struct page *pgtable_t; #endif /* CONFIG_MMU */ @@ -195,6 +199,4 @@ extern pmd_t *top_pmd; #include -#endif /* __KERNEL__ */ - #endif