Merge remote-tracking branch 'ovl/misc' into work.misc

[cascardo/linux.git] / lib / bug.c

diff --git a/lib/bug.c b/lib/bug.c
index cff145f..bc3656e 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -167,19 +167,8 @@ 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 */
-               pr_warn("------------[ cut here ]------------\n");
-
-               if (file)
-                       pr_warn("WARNING: at %s:%u\n", file, line);
-               else
-                       pr_warn("WARNING: at %p [verbose debug info unavailable]\n",
-                               (void *)bugaddr);
-
-               print_modules();
-               show_regs(regs);
-               print_oops_end_marker();
-               /* Just a warning, don't kill lockdep. */
-               add_taint(BUG_GET_TAINT(bug), LOCKDEP_STILL_OK);
+               __warn(file, line, (void *)bugaddr, BUG_GET_TAINT(bug), regs,
+                      NULL);
                return BUG_TRAP_TYPE_WARN;
        }