Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

[deliverable/linux.git] / mm / mremap.c

diff --git a/mm/mremap.c b/mm/mremap.c
index 8eeba02fc99137b5a47996750159de8a455e2c4d..3fa0a467df66749e5021e29cb504a1924526bcad 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -20,7 +20,6 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/mmu_notifier.h>
-#include <linux/sched/sysctl.h>
 #include <linux/uaccess.h>
 #include <linux/mm-arch-hooks.h>
 
@@ -214,8 +213,7 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
                                continue;
                        VM_BUG_ON(pmd_trans_huge(*old_pmd));
                }
-               if (pmd_none(*new_pmd) && __pte_alloc(new_vma->vm_mm, new_vma,
-                                                     new_pmd, new_addr))
+               if (pte_alloc(new_vma->vm_mm, new_pmd, new_addr))
                        break;
                next = (new_addr + PMD_SIZE) & PMD_MASK;
                if (extent > next - new_addr)