diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-11-21 16:27:49 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-02-21 19:24:14 +0000 |
| commit | 516295e5ab4bf986865cfff856d484ec678e3b0b (patch) | |
| tree | 2125f49635462fca18ac6d36ebf7363d3cc6d521 /arch/arm/lib | |
| parent | f60892d3e36dcdd0d9f30db05beae7a446a93f28 (diff) | |
| download | linux-stable-516295e5ab4bf986865cfff856d484ec678e3b0b.tar.gz linux-stable-516295e5ab4bf986865cfff856d484ec678e3b0b.tar.bz2 linux-stable-516295e5ab4bf986865cfff856d484ec678e3b0b.zip | |
ARM: pgtable: add pud-level code
Add pud_offset() et.al. between the pgd and pmd code in preparation of
using pgtable-nopud.h rather than 4level-fixup.h.
This incorporates a fix from Jamie Iles <jamie@jamieiles.com> for
uaccess_with_memcpy.c.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/uaccess_with_memcpy.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c index e2d2f2cd0c4f..8b9b13649f81 100644 --- a/arch/arm/lib/uaccess_with_memcpy.c +++ b/arch/arm/lib/uaccess_with_memcpy.c @@ -27,13 +27,18 @@ pin_page_for_write(const void __user *_addr, pte_t **ptep, spinlock_t **ptlp) pgd_t *pgd; pmd_t *pmd; pte_t *pte; + pud_t *pud; spinlock_t *ptl; pgd = pgd_offset(current->mm, addr); if (unlikely(pgd_none(*pgd) || pgd_bad(*pgd))) return 0; - pmd = pmd_offset(pgd, addr); + pud = pud_offset(pgd, addr); + if (unlikely(pud_none(*pud) || pud_bad(*pud))) + return 0; + + pmd = pmd_offset(pud, addr); if (unlikely(pmd_none(*pmd) || pmd_bad(*pmd))) return 0; |