From c7d7599117b304a813be7bf89ae6f43f5716aa19 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 10 Aug 2010 18:03:29 -0700
Subject: [PATCH] --- yaml --- r: 208555 b: refs/heads/master c:
 e2e7e093259d4c6b73b432122974393d6fcdfc2a h: refs/heads/master i:   208553:
 299f6b0cce038ef9f2352c092ac3a22561875cdc   208551:
 610c8b57eaf0ef2ff229c54f20ac8d6fe84ccb12 v: v3

---
 [refs]          |  2 +-
 trunk/lib/bug.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 9e388efc07d3..b78a38bae915 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7ff0d9c92435e836e13aaa8d0e56d4000424bcc
+refs/heads/master: e2e7e093259d4c6b73b432122974393d6fcdfc2a
diff --git a/trunk/lib/bug.c b/trunk/lib/bug.c
index f13daf435211..6c5b30cf3f0f 100644
--- a/trunk/lib/bug.c
+++ b/trunk/lib/bug.c
@@ -136,8 +136,6 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
 	bug = find_bug(bugaddr);
 
-	printk(KERN_EMERG "------------[ cut here ]------------\n");
-
 	file = NULL;
 	line = 0;
 	warning = 0;
@@ -156,19 +154,24 @@ 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");
+
 		if (file)
-			printk(KERN_ERR "Badness at %s:%u\n",
+			printk(KERN_WARNING "WARNING: at %s:%u\n",
 			       file, line);
 		else
-			printk(KERN_ERR "Badness at %p "
+			printk(KERN_WARNING "WARNING: at %p "
 			       "[verbose debug info unavailable]\n",
 			       (void *)bugaddr);
 
+		print_modules();
 		show_regs(regs);
 		add_taint(BUG_GET_TAINT(bug));
 		return BUG_TRAP_TYPE_WARN;
 	}
 
+	printk(KERN_EMERG "------------[ cut here ]------------\n");
+
 	if (file)
 		printk(KERN_CRIT "kernel BUG at %s:%u!\n",
 		       file, line);