4 files changed, 15 insertions, 5 deletions

diff --git a/arch/arm/mm/pgd.c b/arch/arm/mm/pgd.c
index 249379535be2..a3681f11dd9f 100644
--- a/arch/arm/mm/pgd.c
+++ b/arch/arm/mm/pgd.c
@@ -97,6 +97,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
 
 no_pte:
         pmd_free(mm, new_pmd);
+        mm_dec_nr_pmds(mm);
 no_pmd:
         pud_free(mm, new_pud);
 no_pud:
@@ -130,9 +131,11 @@ void pgd_free(struct mm_struct *mm, pgd_t *pgd_base)
         pte = pmd_pgtable(*pmd);
         pmd_clear(pmd);
         pte_free(mm, pte);
+        atomic_long_dec(&mm->nr_ptes);
 no_pmd:
         pud_clear(pud);
         pmd_free(mm, pmd);
+        mm_dec_nr_pmds(mm);
 no_pud:
         pgd_clear(pgd);
         pud_free(mm, pud);
@@ -152,6 +155,7 @@ no_pgd:
                 pmd = pmd_offset(pud, 0);
                 pud_clear(pud);
                 pmd_free(mm, pmd);
+                mm_dec_nr_pmds(mm);
                 pgd_clear(pgd);
                 pud_free(mm, pud);
         }
diff --git a/arch/unicore32/mm/pgd.c b/arch/unicore32/mm/pgd.c
index 08b8d4295e70..2ade20d8eab3 100644
--- a/arch/unicore32/mm/pgd.c
+++ b/arch/unicore32/mm/pgd.c
@@ -69,6 +69,7 @@ pgd_t *get_pgd_slow(struct mm_struct *mm)
 
 no_pte:
         pmd_free(mm, new_pmd);
+        mm_dec_nr_pmds(mm);
 no_pmd:
         free_pages((unsigned long)new_pgd, 0);
 no_pgd:
@@ -96,7 +97,9 @@ void free_pgd_slow(struct mm_struct *mm, pgd_t *pgd)
         pte = pmd_pgtable(*pmd);
         pmd_clear(pmd);
         pte_free(mm, pte);
+        atomic_long_dec(&mm->nr_ptes);
         pmd_free(mm, pmd);
+        mm_dec_nr_pmds(mm);
 free:
         free_pages((unsigned long) pgd, 0);
 }
diff --git a/kernel/fork.c b/kernel/fork.c
index c99098c52641..66e19c251581 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -606,6 +606,14 @@ static void check_mm(struct mm_struct *mm)
                         printk(KERN_ALERT "BUG: Bad rss-counter state "
                                           "mm:%p idx:%d val:%ld\n", mm, i, x);
         }
+
+        if (atomic_long_read(&mm->nr_ptes))
+                pr_alert("BUG: non-zero nr_ptes on freeing mm: %ld\n",
+                                atomic_long_read(&mm->nr_ptes));
+        if (mm_nr_pmds(mm))
+                pr_alert("BUG: non-zero nr_pmds on freeing mm: %ld\n",
+                                mm_nr_pmds(mm));
+
 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS
         VM_BUG_ON_MM(mm->pmd_huge_pte, mm);
 #endif
diff --git a/mm/mmap.c b/mm/mmap.c
index 6a7d36d133fb..c5f44682c0d1 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -2851,11 +2851,6 @@ void exit_mmap(struct mm_struct *mm)
                 vma = remove_vma(vma);
         }
         vm_unacct_memory(nr_accounted);
-
-        WARN_ON(atomic_long_read(&mm->nr_ptes) >
-                        round_up(FIRST_USER_ADDRESS, PMD_SIZE) >> PMD_SHIFT);
-        WARN_ON(mm_nr_pmds(mm) >
-                        round_up(FIRST_USER_ADDRESS, PUD_SIZE) >> PUD_SHIFT);
 }
 
 /* Insert vm structure into process list sorted by address