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

Commit e423f49f authored by Alexander van Heukelum's avatar Alexander van Heukelum Committed by Ingo Molnar
Browse files

x86: traps_xx: modify __die 



if (cond) block -> if (!cond) goto end_of_block

Signed-off-by: default avatarAlexander van Heukelum <heukelum@fastmail.fm>
Acked-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent badc7652

arch/x86/kernel/traps_32.c

+13 −17
Original line number Diff line number Diff line
@@ -399,9 +399,9 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
	printk("DEBUG_PAGEALLOC");

#endif

	printk("\n");



	if (notify_die(DIE_OOPS, str, regs, err,

			current->thread.trap_no, SIGSEGV) != NOTIFY_STOP) {

			current->thread.trap_no, SIGSEGV) == NOTIFY_STOP)

		return 1;



	show_registers(regs);

	/* Executive summary in case the oops scrolled away */
@@ -414,13 +414,9 @@ int __kprobes __die(const char *str, struct pt_regs *regs, long err) 
	printk(KERN_EMERG "EIP: [<%08lx>] ", regs->ip);

	print_symbol("%s", regs->ip);

	printk(" SS:ESP %04x:%08lx\n", ss, sp);



	return 0;

}



	return 1;

}



/*

 * This is gone through when something in the kernel has done something bad

 * and is about to be terminated:

arch/x86/kernel/traps_64.c

+2 −2

File changed.

Contains only whitespace changes.