Commit 10423c91 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Fix duplicate invocation of notify_die. 



Initial patch by Yury Polyanskiy <ypolyans@princeton.edu>.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/2373/
parent 3436830a

arch/mips/kernel/traps.c

+2 −4
Original line number Diff line number Diff line
@@ -374,7 +374,8 @@ void __noreturn die(const char *str, struct pt_regs *regs) 
	unsigned long dvpret = dvpe();

#endif /* CONFIG_MIPS_MT_SMTC */



	notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV);

	if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP)

		sig = 0;



	console_verbose();

	spin_lock_irq(&die_lock);
@@ -383,9 +384,6 @@ void __noreturn die(const char *str, struct pt_regs *regs) 
	mips_mt_regdump(dvpret);

#endif /* CONFIG_MIPS_MT_SMTC */



	if (notify_die(DIE_OOPS, str, regs, 0, regs_to_trapnr(regs), SIGSEGV) == NOTIFY_STOP)

		sig = 0;



	printk("%s[#%d]:\n", str, ++die_counter);

	show_registers(regs);

	add_taint(TAINT_DIE);