diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-03-17 08:55:01 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-03-17 08:55:01 +0100 |
| commit | 74c8ce958dbf0b64f198becb5d8aa93afb967438 (patch) | |
| tree | 1744f366cad9c71ae08c2732365e9a3edb4f5e12 /mm/gup.c | |
| parent | x86: Make the GDT remapping read-only on 64-bit (diff) | |
| parent | Merge tag 'xfs-4.11-fixes-2' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux (diff) | |
| download | linux-dev-74c8ce958dbf0b64f198becb5d8aa93afb967438.tar.xz linux-dev-74c8ce958dbf0b64f198becb5d8aa93afb967438.zip | |
Merge branch 'linus' into x86/mm, to pick up a bugfix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/gup.c')
| -rw-r--r-- | mm/gup.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1455,7 +1455,7 @@ static int gup_p4d_range(pgd_t pgd, unsigned long addr, unsigned long end, if (!gup_huge_pd(__hugepd(p4d_val(p4d)), addr, P4D_SHIFT, next, write, pages, nr)) return 0; - } else if (!gup_p4d_range(p4d, addr, next, write, pages, nr)) + } else if (!gup_pud_range(p4d, addr, next, write, pages, nr)) return 0; } while (p4dp++, addr = next, addr != end); |