Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 863a6049 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds
Browse files

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: default avatarAnton 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e2e7e093

include/linux/kernel.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

kernel/panic.c

+1 −1
Original line number Diff line number Diff line
@@ -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",

lib/bug.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

	}