mm-mremap-use-pmd-pud_poplulate-to-update-page-table-entries-fix

Link: https://lkml.kernel.org/r/87mtsrqqk0.fsf@linux.ibm.com
Tested-by: Nathan Chancellor <nathan@kernel.org>
Tested-by: Peter Xu <peterx@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Kalesh Singh <kaleshsingh@google.com>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --git a/mm/mremap.c b/mm/mremap.c
index bbb3dd955441992ff010f076b0c17cf0bf92f7f6..3481aafce1b41af5b674f7761fd958708789e5e4 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -258,7 +258,7 @@ static bool move_normal_pmd(struct vm_area_struct *vma, unsigned long old_addr,
        pmd_clear(old_pmd);
 
        VM_BUG_ON(!pmd_none(*new_pmd));
-       pmd_populate(mm, new_pmd, (pgtable_t)pmd_page_vaddr(pmd));
+       pmd_populate(mm, new_pmd, pmd_pgtable(pmd));
 
        flush_tlb_range(vma, old_addr, old_addr + PMD_SIZE);
        if (new_ptl != old_ptl)