diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 22:33:19 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-06 22:33:19 +0000 |
| commit | 28cdac6690cb113856293bf79b40de33dbd8f974 (patch) | |
| tree | 64cd8ca8376ccf9a12faee3588c15a5839f9a28b /arch/arm/include/asm/page.h | |
| parent | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (diff) | |
| parent | 36bb94ba36f332de767cfaa3af6a5136435a3a9c (diff) | |
| download | kernel_samsung_espresso10-28cdac6690cb113856293bf79b40de33dbd8f974.zip kernel_samsung_espresso10-28cdac6690cb113856293bf79b40de33dbd8f974.tar.gz kernel_samsung_espresso10-28cdac6690cb113856293bf79b40de33dbd8f974.tar.bz2 | |
Merge branch 'pgt' (early part) into devel
Diffstat (limited to 'arch/arm/include/asm/page.h')
| -rw-r--r-- | arch/arm/include/asm/page.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h index a485ac3..f51a695 100644 --- a/arch/arm/include/asm/page.h +++ b/arch/arm/include/asm/page.h @@ -151,13 +151,15 @@ extern void __cpu_copy_user_highpage(struct page *to, struct page *from, #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) extern void copy_page(void *to, const void *from); +typedef unsigned long pteval_t; + #undef STRICT_MM_TYPECHECKS #ifdef STRICT_MM_TYPECHECKS /* * These are used to make use of C type-checking.. */ -typedef struct { unsigned long pte; } pte_t; +typedef struct { pteval_t pte; } pte_t; typedef struct { unsigned long pmd; } pmd_t; typedef struct { unsigned long pgd[2]; } pgd_t; typedef struct { unsigned long pgprot; } pgprot_t; @@ -175,7 +177,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; /* * .. while these make it easier on the compiler */ -typedef unsigned long pte_t; +typedef pteval_t pte_t; typedef unsigned long pmd_t; typedef unsigned long pgd_t[2]; typedef unsigned long pgprot_t; |