diff --git a/[refs] b/[refs]
index 40ad16e5b879..33672a1316ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46dcde735c9d8953bbd8d105ca6779e5b5300c28
+refs/heads/master: 8e72033f2a489b6c98c4e3c7cc281b1afd6cb85c
diff --git a/trunk/mm/huge_memory.c b/trunk/mm/huge_memory.c
index bec6243b6965..010d32944d14 100644
--- a/trunk/mm/huge_memory.c
+++ b/trunk/mm/huge_memory.c
@@ -1450,6 +1450,8 @@ int split_huge_page(struct page *page)
 int hugepage_madvise(struct vm_area_struct *vma,
 		     unsigned long *vm_flags, int advice)
 {
+	struct mm_struct *mm = vma->vm_mm;
+
 	switch (advice) {
 	case MADV_HUGEPAGE:
 		/*
@@ -1457,6 +1459,8 @@ int hugepage_madvise(struct vm_area_struct *vma,
 		 */
 		if (*vm_flags & (VM_HUGEPAGE | VM_NO_THP))
 			return -EINVAL;
+		if (mm->def_flags & VM_NOHUGEPAGE)
+			return -EINVAL;
 		*vm_flags &= ~VM_NOHUGEPAGE;
 		*vm_flags |= VM_HUGEPAGE;
 		/*