diff options
author | Mark Brown <broonie@kernel.org> | 2015-03-03 09:36:44 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-03-03 09:36:44 +0000 |
commit | a0d6a47ed69978c84ba8859c3cdbbbd04e79eb2d (patch) | |
tree | 30cf64632dd0c25fb07c1ab8dd590efa6991f1a3 /mm | |
parent | 3af2dae32ca1108e47a435eaeec276a1c8289a36 (diff) | |
parent | 413cb08cebe9fd8107f556eee48b2d40773cacde (diff) |
Merge tag 'v3.14.34' into linux-linaro-lsk-v3.14
This is the 3.14.34 stable release
Conflicts:
arch/arm64/kernel/setup.c
Diffstat (limited to 'mm')
-rw-r--r-- | mm/pagewalk.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 2beeabf502c5..9056d22d2880 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -199,7 +199,10 @@ int walk_page_range(unsigned long addr, unsigned long end, */ if ((vma->vm_start <= addr) && (vma->vm_flags & VM_PFNMAP)) { - next = vma->vm_end; + if (walk->pte_hole) + err = walk->pte_hole(addr, next, walk); + if (err) + break; pgd = pgd_offset(walk->mm, next); continue; } |