Commit e53289c0 authored Jan 09, 2013 by Linus Torvalds

mm: reinstante dropped pmd_trans_splitting() check



The check for a pmd being in the process of being split was dropped by
mistake by commit d10e63f2 ("mm: numa: Create basic numa page
hinting infrastructure"). Put it back.

Reported-by: Dave Jones <davej@redhat.com>
Debugged-by: Hillf Danton <dhillf@gmail.com>
Acked-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Cc: Kirill Shutemov <kirill@shutemov.name>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 08c097fc

mm/memory.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -3711,6 +3711,14 @@ int handle_mm_fault(struct mm_struct mm, struct vm_area_struct vma,
		if (pmd_trans_huge(orig_pmd)) {
		unsigned int dirty = flags & FAULT_FLAG_WRITE;

		/*
		* If the pmd is splitting, return and retry the
		* the fault. Alternative: wait until the split
		* is done, and goto retry.
		*/
		if (pmd_trans_splitting(orig_pmd))
		return 0;

		if (pmd_numa(orig_pmd))
		return do_huge_pmd_numa_page(mm, vma, address,
		orig_pmd, pmd);