Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce8369bc authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

mm: actually clear pmd_numa before invalidating 



Commit 67f87463 ("mm: clear pmd_numa before invalidating") cleared
the NUMA bit in a copy of the PMD entry, but then wrote back the
original

Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Reviewed-by: default avatarRik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0cfb8f0c

mm/pgtable-generic.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -195,7 +195,7 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, 
	pmd_t entry = *pmdp;

	pmd_t entry = *pmdp;

	if (pmd_numa(entry))

	if (pmd_numa(entry))

		entry = pmd_mknonnuma(entry);

		entry = pmd_mknonnuma(entry);

	set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(*pmdp));

	set_pmd_at(vma->vm_mm, address, pmdp, pmd_mknotpresent(entry));

	flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);

	flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);

}

}

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */