diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-17 03:22:51 +0200 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-04-17 03:22:51 +0200 |
commit | 1cbee462a5afc1cc30389915b3d18bdcb3c47ad6 (patch) | |
tree | b1e2b5836e52788c356c21efe716f6faa694c823 /arch | |
parent | Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mp... (diff) | |
parent | powerpc/hugetlb: Call mm_dec_nr_pmds() in hugetlb_free_pmd_range() (diff) | |
download | linux-1cbee462a5afc1cc30389915b3d18bdcb3c47ad6.tar.xz linux-1cbee462a5afc1cc30389915b3d18bdcb3c47ad6.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into fixes
Diffstat (limited to 'arch')
-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, 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, |