diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-16 21:22:51 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-16 21:22:51 -0400 |
commit | 1cbee462a5afc1cc30389915b3d18bdcb3c47ad6 (patch) | |
tree | b1e2b5836e52788c356c21efe716f6faa694c823 /arch/powerpc | |
parent | d19d5efd8c8840aa4f38a6dfbfe500d8cc27de46 (diff) | |
parent | 50c6a665b383cb5839e45d04e36faeeefaffa052 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into fixes
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index fa9d5c238d22..2cb278a2f658 100644 --- 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, | |||
581 | pmd = pmd_offset(pud, start); | 581 | pmd = pmd_offset(pud, start); |
582 | pud_clear(pud); | 582 | pud_clear(pud); |
583 | pmd_free_tlb(tlb, pmd, start); | 583 | pmd_free_tlb(tlb, pmd, start); |
584 | mm_dec_nr_pmds(tlb->mm); | ||
584 | } | 585 | } |
585 | 586 | ||
586 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, | 587 | static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd, |