Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into fixes

1cbee462 · Michael Ellerman · d19d5efd · 50c6a665 · 1cbee462
Commit 1cbee462 authored Apr 17, 2015 by Michael Ellerman
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

arch/powerpc/mm/hugetlbpage.c arch/powerpc/mm/hugetlbpage.c +1 -0

No files found.
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -581,6 +581,7 @@ static void hugetlb_free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
 	pmd = pmd_offset(pud, start);
 	pud_clear(pud);
 	pmd_free_tlb(tlb, pmd, start);
+	mm_dec_nr_pmds(tlb->mm);
 }

 static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,