mm: use VM_BUG_ON_MM where possible

Dump the contents of the relevant struct_mm when we hit the bug condition.

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/kernel/fork.c b/kernel/fork.c
index a91e47d..8c162d1 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -601,9 +601,8 @@ 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 defined(CONFIG_TRANSPARENT_HUGEPAGE) && !USE_SPLIT_PMD_PTLOCKS
-       VM_BUG_ON(mm->pmd_huge_pte);
+       VM_BUG_ON_MM(mm->pmd_huge_pte, mm);
 #endif
 }
 

diff --cc kernel/sys.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc mm/mlock.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/pagewalk.c
Simple merge