diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-08-30 00:18:33 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-30 01:28:15 +0200 |
| commit | ce8369bcbeeea6dfe24a6c8f60d2fcfce0432830 (patch) | |
| tree | cab3a6f2bb0c8ccb26fb9c6676d697c1612c3949 /mm | |
| parent | memblock, memhotplug: fix wrong type in memblock_find_in_range_node(). (diff) | |
| download | linux-ce8369bcbeeea6dfe24a6c8f60d2fcfce0432830.tar.xz linux-ce8369bcbeeea6dfe24a6c8f60d2fcfce0432830.zip | |
mm: actually clear pmd_numa before invalidating
Commit 67f87463d3a3 ("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: Matthew Wilcox <matthew.r.wilcox@intel.com>
Acked-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/pgtable-generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/pgtable-generic.c b/mm/pgtable-generic.c index a8b919925934..dfb79e028ecb 100644 --- a/mm/pgtable-generic.c +++ b/mm/pgtable-generic.c @@ -195,7 +195,7 @@ void pmdp_invalidate(struct vm_area_struct *vma, unsigned long address, pmd_t entry = *pmdp; if (pmd_numa(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); } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ |