diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-07 01:33:19 +0300 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-07 01:33:19 +0300 |
| commit | 28cdac6690cb113856293bf79b40de33dbd8f974 (patch) | |
| tree | 64cd8ca8376ccf9a12faee3588c15a5839f9a28b /arch/arm/mm/mm.h | |
| parent | 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 (diff) | |
| parent | 36bb94ba36f332de767cfaa3af6a5136435a3a9c (diff) | |
| download | linux-28cdac6690cb113856293bf79b40de33dbd8f974.tar.xz | |
Merge branch 'pgt' (early part) into devel
Diffstat (limited to 'arch/arm/mm/mm.h')
| -rw-r--r-- | arch/arm/mm/mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mm.h b/arch/arm/mm/mm.h index 6630620380a4..36960df5fb76 100644 --- a/arch/arm/mm/mm.h +++ b/arch/arm/mm/mm.h @@ -16,7 +16,7 @@ static inline pmd_t *pmd_off_k(unsigned long virt) } struct mem_type { - unsigned int prot_pte; + pteval_t prot_pte; unsigned int prot_l1; unsigned int prot_sect; unsigned int domain; |