OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/bug.c: make WARN implementation match the kernel/panic.c one

Browse Source 
There are a few issues with the exception based WARN implementation in
lib/bug.c:

- Inconsistent printk flags. The "cut here" line is printed at KERN_EMERG, so
  the console and all logged in users see the single line:

------------[ cut here ]------------

  for each WARN. Fix this so we print everything at KERN_WARNING to match the
  kernel/panic.c version.

- The lib/bug.c WARN would print "Badness at". Change it to match the
  kernel/panic.c version which prints "WARNING: at".

- Print the list of modules, similar to kernel/panic.c of modules, similar to
  kernel/panic.c

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Anton Blanchard <anton@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@infradead.org>
Cc: "Kirill A. Shutemov" <kirill@shutemov.name>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Anton Blanchard 2010-08-10 18:03:29 -07:00 committed by Linus Torvalds
parent c7ff0d9c92
commit e2e7e09325
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/bug.c
View File

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