Merge tag 'usercopy-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

[cascardo/linux.git] / mm / mprotect.c

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 5019a1e..a4830f0 100644 (file)
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -163,7 +163,7 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
                if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
                        if (next - addr != HPAGE_PMD_SIZE) {
                                split_huge_pmd(vma, pmd, addr);
-                               if (pmd_none(*pmd))
+                               if (pmd_trans_unstable(pmd))
                                        continue;
                        } else {
                                int nr_ptes = change_huge_pmd(vma, pmd, addr,