提交 863a6049 编写于 作者: A Anton Blanchard 提交者: Linus Torvalds

lib/bug.c: add oops end marker to WARN implementation

We are missing the oops end marker for the exception based WARN implementation
in lib/bug.c. This is useful for logfile analysis tools.
Signed-off-by: NAnton 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: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 e2e7e093
...@@ -182,6 +182,7 @@ NORET_TYPE void panic(const char * fmt, ...) ...@@ -182,6 +182,7 @@ NORET_TYPE void panic(const char * fmt, ...)
__attribute__ ((NORET_AND format (printf, 1, 2))) __cold; __attribute__ ((NORET_AND format (printf, 1, 2))) __cold;
extern void oops_enter(void); extern void oops_enter(void);
extern void oops_exit(void); extern void oops_exit(void);
void print_oops_end_marker(void);
extern int oops_may_print(void); extern int oops_may_print(void);
NORET_TYPE void do_exit(long error_code) NORET_TYPE void do_exit(long error_code)
ATTRIB_NORET; ATTRIB_NORET;
......
...@@ -338,7 +338,7 @@ static int init_oops_id(void) ...@@ -338,7 +338,7 @@ static int init_oops_id(void)
} }
late_initcall(init_oops_id); late_initcall(init_oops_id);
static void print_oops_end_marker(void) void print_oops_end_marker(void)
{ {
init_oops_id(); init_oops_id();
printk(KERN_WARNING "---[ end trace %016llx ]---\n", printk(KERN_WARNING "---[ end trace %016llx ]---\n",
......
...@@ -166,6 +166,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs) ...@@ -166,6 +166,7 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
print_modules(); print_modules();
show_regs(regs); show_regs(regs);
print_oops_end_marker();
add_taint(BUG_GET_TAINT(bug)); add_taint(BUG_GET_TAINT(bug));
return BUG_TRAP_TYPE_WARN; return BUG_TRAP_TYPE_WARN;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册