Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

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

diff --git a/mm/mremap.c b/mm/mremap.c
index 1f157adfdaf9e8926d5c0b48b252ced84c52d716..da22ad2a5678265ea9f2d0aa5ece9e14c519a494 100644 (file)
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -210,9 +210,8 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
                                }
                        }
                        split_huge_pmd(vma, old_pmd, old_addr);
-                       if (pmd_none(*old_pmd))
+                       if (pmd_trans_unstable(old_pmd))
                                continue;
-                       VM_BUG_ON(pmd_trans_huge(*old_pmd));
                }
                if (pte_alloc(new_vma->vm_mm, new_pmd, new_addr))
                        break;