Attachment #727765 for bug #1039348

View | Details | Raw Unified | Return to bug 1039348
Collapse All | Expand All

Lines 664-669 int do_huge_pmd_anonymous_page(struct vm_fault *vmf) Link Here

(-)a/mm/huge_memory.c (+3 lines)
664		664
665	if (haddr < vma->vm_start \|\| haddr + HPAGE_PMD_SIZE > vma->vm_end)	665	if (haddr < vma->vm_start \|\| haddr + HPAGE_PMD_SIZE > vma->vm_end)
666	return VM_FAULT_FALLBACK;	666	return VM_FAULT_FALLBACK;
		667	if (stack_guard_area(vma, haddr) \|\|
		668	stack_guard_area(vma, haddr + HPAGE_PMD_SIZE))
		669	return VM_FAULT_FALLBACK;
667	if (unlikely(anon_vma_prepare(vma)))	670	if (unlikely(anon_vma_prepare(vma)))
668	return VM_FAULT_OOM;	671	return VM_FAULT_OOM;
669	if (unlikely(khugepaged_enter(vma, vma->vm_flags)))	672	if (unlikely(khugepaged_enter(vma, vma->vm_flags)))

Lines 859-864 static int hugepage_vma_revalidate(struct mm_struct *mm, unsigned long address, Link Here

(-)a/mm/khugepaged.c (-1 / +4 lines)
859	return SCAN_ADDRESS_RANGE;	859	return SCAN_ADDRESS_RANGE;
860	if (!hugepage_vma_check(vma))	860	if (!hugepage_vma_check(vma))
861	return SCAN_VMA_CHECK;	861	return SCAN_VMA_CHECK;
		862
		863	/* never try to collapse stack gap */
		864	if (stack_guard_area(vma, hstart) \|\| stack_guard_area(vma, hend))
		865	return SCAN_ADDRESS_RANGE;
862	return 0;	866	return 0;
863	}	867	}
864		868
865	-

Return to bug 1039348