mm: make PR_SET_THP_DISABLE immediately active

[karo-tx-linux.git] / include / linux / khugepaged.h

diff --git a/include/linux/khugepaged.h b/include/linux/khugepaged.h
index 5d9a400af5091f297abec57050b5aa2b2ced11aa..f0d7335336cd6ed00bd2759e4c6fb9a5f5b38671 100644 (file)
--- a/include/linux/khugepaged.h
+++ b/include/linux/khugepaged.h
@@ -48,7 +48,8 @@ static inline int khugepaged_enter(struct vm_area_struct *vma,
        if (!test_bit(MMF_VM_HUGEPAGE, &vma->vm_mm->flags))
                if ((khugepaged_always() ||
                     (khugepaged_req_madv() && (vm_flags & VM_HUGEPAGE))) &&
-                   !(vm_flags & VM_NOHUGEPAGE))
+                   !(vm_flags & VM_NOHUGEPAGE) &&
+                   !test_bit(MMF_DISABLE_THP, &vma->vm_mm->flags))
                        if (__khugepaged_enter(vma->vm_mm))
                                return -ENOMEM;
        return 0;