summaryrefslogtreecommitdiffstats
path: root/lib/bug.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-02-22 23:04:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-02-22 23:04:41 +0100
commit61b80086a525c8a6081257ae40da5dee2bcaee16 (patch)
tree675da35e4c03be3a5ca17bf6430e5b51dfed6296 /lib/bug.c
parentMerge tag 'v3.3-rc2' into depends/rmk/for-armsoc (diff)
parentARM: remove disable_fiq and arch_ret_to_user macros (diff)
downloadlinux-61b80086a525c8a6081257ae40da5dee2bcaee16.tar.xz
linux-61b80086a525c8a6081257ae40da5dee2bcaee16.zip
Merge branch 'entry-macro-cleanup' of git://sources.calxeda.com/kernel/linux into for-armsoc
Diffstat (limited to 'lib/bug.c')
-rw-r--r--lib/bug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bug.c b/lib/bug.c
index 19552096d16b..a28c1415357c 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -169,7 +169,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
return BUG_TRAP_TYPE_WARN;
}
- printk(KERN_EMERG "------------[ cut here ]------------\n");
+ printk(KERN_DEFAULT "------------[ cut here ]------------\n");
if (file)
printk(KERN_CRIT "kernel BUG at %s:%u!\n",