HWPOISON: Stop shrinking at right page count

[net-next-2.6.git] / lib / bug.c

diff --git a/lib/bug.c b/lib/bug.c
index f13daf435211eb17c0ffb3c83f3fffb3dcc03858..7cdfad88128fa5d3d3076d552fbde276ef500d66 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -136,8 +136,6 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
        bug = find_bug(bugaddr);
 
-       printk(KERN_EMERG "------------[ cut here ]------------\n");
-
        file = NULL;
        line = 0;
        warning = 0;
@@ -156,19 +154,25 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
        if (warning) {
                /* this is a WARN_ON rather than BUG/BUG_ON */
+               printk(KERN_WARNING "------------[ cut here ]------------\n");
+
                if (file)
-                       printk(KERN_ERR "Badness at %s:%u\n",
+                       printk(KERN_WARNING "WARNING: at %s:%u\n",
                               file, line);
                else
-                       printk(KERN_ERR "Badness at %p "
+                       printk(KERN_WARNING "WARNING: at %p "
                               "[verbose debug info unavailable]\n",
                               (void *)bugaddr);
 
+               print_modules();
                show_regs(regs);
+               print_oops_end_marker();
                add_taint(BUG_GET_TAINT(bug));
                return BUG_TRAP_TYPE_WARN;
        }
 
+       printk(KERN_EMERG "------------[ cut here ]------------\n");
+
        if (file)
                printk(KERN_CRIT "kernel BUG at %s:%u!\n",
                       file, line);