|
|
@@ -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;
|
|
|
}
|