Merge tag 'xtensa-for-next-20140715' of git://github.com/jcmvbkbc/linux-xtensa into...

[karo-tx-linux.git] / lib / bug.c

diff --git a/lib/bug.c b/lib/bug.c
index 168603477f02889f13fd7119cc55f5e325b08ff9..d1d7c78789003fec506cfedcf05b2ecd8552b6b3 100644 (file)
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -37,6 +37,9 @@
 
     Jeremy Fitzhardinge <jeremy@goop.org> 2006
  */
+
+#define pr_fmt(fmt) fmt
+
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -153,15 +156,13 @@ 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");
+               pr_warn("------------[ cut here ]------------\n");
 
                if (file)
-                       printk(KERN_WARNING "WARNING: at %s:%u\n",
-                              file, line);
+                       pr_warn("WARNING: at %s:%u\n", file, line);
                else
-                       printk(KERN_WARNING "WARNING: at %p "
-                              "[verbose debug info unavailable]\n",
-                              (void *)bugaddr);
+                       pr_warn("WARNING: at %p [verbose debug info unavailable]\n",
+                               (void *)bugaddr);
 
                print_modules();
                show_regs(regs);
@@ -174,12 +175,10 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
        printk(KERN_DEFAULT "------------[ cut here ]------------\n");
 
        if (file)
-               printk(KERN_CRIT "kernel BUG at %s:%u!\n",
-                      file, line);
+               pr_crit("kernel BUG at %s:%u!\n", file, line);
        else
-               printk(KERN_CRIT "Kernel BUG at %p "
-                      "[verbose debug info unavailable]\n",
-                      (void *)bugaddr);
+               pr_crit("Kernel BUG at %p [verbose debug info unavailable]\n",
+                       (void *)bugaddr);
 
        return BUG_TRAP_TYPE_BUG;
 }