diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-05 23:43:03 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-05 23:43:03 +0100 |
| commit | 3872fe83a2fbb7366daa93ca533a22138e2d483e (patch) | |
| tree | e9c7c7a4a09a551011286a866235594b76cb73af /mm/page_vma_mapped.c | |
| parent | 3cc070c1c81948b33ebe2ea68cd39307ce2b312d (diff) | |
| parent | 974310d047f3c7788a51d10c8d255eebdb1fa857 (diff) | |
| download | linux-3872fe83a2fbb7366daa93ca533a22138e2d483e.tar.gz linux-3872fe83a2fbb7366daa93ca533a22138e2d483e.tar.bz2 linux-3872fe83a2fbb7366daa93ca533a22138e2d483e.zip | |
Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'mm/page_vma_mapped.c')
| -rw-r--r-- | mm/page_vma_mapped.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index a23001a22c15..c4c9def8ffea 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -104,6 +104,7 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) struct mm_struct *mm = pvmw->vma->vm_mm; struct page *page = pvmw->page; pgd_t *pgd; + p4d_t *p4d; pud_t *pud; /* The only possible pmd mapping has been handled on last iteration */ @@ -133,7 +134,10 @@ restart: pgd = pgd_offset(mm, pvmw->address); if (!pgd_present(*pgd)) return false; - pud = pud_offset(pgd, pvmw->address); + p4d = p4d_offset(pgd, pvmw->address); + if (!p4d_present(*p4d)) + return false; + pud = pud_offset(p4d, pvmw->address); if (!pud_present(*pud)) return false; pvmw->pmd = pmd_offset(pud, pvmw->address); |