Revert "mm: do not collapse stack gap into THP"

[mirror_ubuntu-zesty-kernel.git] / mm / huge_memory.c

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 75719aa0443a322f8008f64459d52256df77a34e..49cb70b5993deddd13e54fda231f14cf414ce543 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -660,9 +660,6 @@ int do_huge_pmd_anonymous_page(struct vm_fault *vmf)
 
        if (haddr < vma->vm_start || haddr + HPAGE_PMD_SIZE > vma->vm_end)
                return VM_FAULT_FALLBACK;
-       if (stack_guard_area(vma, haddr) ||
-                       stack_guard_area(vma, haddr + HPAGE_PMD_SIZE))
-               return VM_FAULT_FALLBACK;
        if (unlikely(anon_vma_prepare(vma)))
                return VM_FAULT_OOM;
        if (unlikely(khugepaged_enter(vma, vma->vm_flags)))