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

Commit c0f2e176 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Linus Torvalds
Browse files

mm: use the correct page size when removing the page 

We are removing a pmd hugepage here.  Use the correct page size.

Link: http://lkml.kernel.org/r/20161026084839.27299-2-aneesh.kumar@linux.vnet.ibm.com


Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 23f919d4

mm/huge_memory.c

+2 −2
Original line number Diff line number Diff line
@@ -1399,12 +1399,12 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, 
	if (vma_is_dax(vma)) {

		spin_unlock(ptl);

		if (is_huge_zero_pmd(orig_pmd))

			tlb_remove_page(tlb, pmd_page(orig_pmd));

			tlb_remove_page_size(tlb, pmd_page(orig_pmd), HPAGE_PMD_SIZE);

	} else if (is_huge_zero_pmd(orig_pmd)) {

		pte_free(tlb->mm, pgtable_trans_huge_withdraw(tlb->mm, pmd));

		atomic_long_dec(&tlb->mm->nr_ptes);

		spin_unlock(ptl);

		tlb_remove_page(tlb, pmd_page(orig_pmd));

		tlb_remove_page_size(tlb, pmd_page(orig_pmd), HPAGE_PMD_SIZE);

	} else {

		struct page *page = pmd_page(orig_pmd);

		page_remove_rmap(page, true);