From cfa4f8524e5e1b13dca5bf60560a9e308f00f9bc Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 10 Aug 2010 18:03:30 -0700
Subject: [PATCH] --- yaml --- r: 208556 b: refs/heads/master c:
 863a6049202412a6d655d052eb1c45ca7dd74a83 h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/linux/kernel.h | 1 +
 trunk/kernel/panic.c         | 2 +-
 trunk/lib/bug.c              | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b78a38bae915..b734d1ca6ba4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2e7e093259d4c6b73b432122974393d6fcdfc2a
+refs/heads/master: 863a6049202412a6d655d052eb1c45ca7dd74a83
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 452833d67b21..d848cb854655 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -182,6 +182,7 @@ NORET_TYPE void panic(const char * fmt, ...)
 	__attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
 extern void oops_enter(void);
 extern void oops_exit(void);
+void print_oops_end_marker(void);
 extern int oops_may_print(void);
 NORET_TYPE void do_exit(long error_code)
 	ATTRIB_NORET;
diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c
index 3e9037ae10e1..4c13b1a88ebb 100644
--- a/trunk/kernel/panic.c
+++ b/trunk/kernel/panic.c
@@ -338,7 +338,7 @@ static int init_oops_id(void)
 }
 late_initcall(init_oops_id);
 
-static void print_oops_end_marker(void)
+void print_oops_end_marker(void)
 {
 	init_oops_id();
 	printk(KERN_WARNING "---[ end trace %016llx ]---\n",
diff --git a/trunk/lib/bug.c b/trunk/lib/bug.c
index 6c5b30cf3f0f..7cdfad88128f 100644
--- a/trunk/lib/bug.c
+++ b/trunk/lib/bug.c
@@ -166,6 +166,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 
 		print_modules();
 		show_regs(regs);
+		print_oops_end_marker();
 		add_taint(BUG_GET_TAINT(bug));
 		return BUG_TRAP_TYPE_WARN;
 	}