]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
mm, gup: fix typo in gup_p4d_range()
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Mon, 13 Mar 2017 05:22:13 +0000 (08:22 +0300)
committerShannon Nelson <shannon.nelson@oracle.com>
Wed, 31 May 2017 23:43:51 +0000 (16:43 -0700)
gup_p4d_range() should call gup_pud_range(), not itself.

[ This was not noticed on x86: this is the HAVE_GENERIC_RCU_GUP code
  used by arm[64] and powerpc    - Linus ]

Fixes: c2febafc6773 ("mm: convert generic code to 5-level paging")
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Reported-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reported-by: Anton Blanchard <anton@samba.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit ce70df089143c49385b4f32f39d41fb50fbf6a7c)

Orabug: 25808647

Signed-off-by: Vijay Kumar <vijay.ac.kumar@oracle.com>
Signed-off-by: Shannon Nelson <shannon.nelson@oracle.com>
mm/gup.c

index d3ec27a3791cf40ff5bd67314628eccd9a3fa5b2..138e6afecc992d166615350378933a8354e78dca 100644 (file)
--- a/mm/gup.c
+++ b/mm/gup.c
@@ -1331,7 +1331,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);