1 files changed, 9 insertions, 6 deletions

diff --git a/mm/memory.c b/mm/memory.c
index d63849b5188f..bbe6a73a899d 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -428,6 +428,7 @@ static inline void 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 inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
@@ -3322,15 +3323,17 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
 
         spin_lock(&mm->page_table_lock);
 #ifndef __ARCH_HAS_4LEVEL_HACK
-        if (pud_present(*pud))          /* Another has populated it */
-                pmd_free(mm, new);
-        else
+        if (!pud_present(*pud)) {
+                mm_inc_nr_pmds(mm);
                 pud_populate(mm, pud, new);
-#else
-        if (pgd_present(*pud))          /* Another has populated it */
+        } else  /* Another has populated it */
                 pmd_free(mm, new);
-        else
+#else
+        if (!pgd_present(*pud)) {
+                mm_inc_nr_pmds(mm);
                 pgd_populate(mm, pud, new);
+        } else /* Another has populated it */
+                pmd_free(mm, new);
 #endif /* __ARCH_HAS_4LEVEL_HACK */
         spin_unlock(&mm->page_table_lock);
         return 0;