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

Commit 260c9673 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Ralf Baechle
Browse files

Mark __die() "noreturn" for real. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 778220f7

arch/mips/kernel/traps.c

+3 −2
Original line number Diff line number Diff line
@@ -254,8 +254,9 @@ void show_registers(struct pt_regs *regs) 


static DEFINE_SPINLOCK(die_lock);



NORET_TYPE void __die(const char * str, struct pt_regs * regs,

	const char * file, const char * func, unsigned long line)

NORET_TYPE void ATTRIB_NORET __die(const char * str, struct pt_regs * regs,

				   const char * file, const char * func,

				   unsigned long line)

{

	static int die_counter;

include/asm-mips/system.h

+1 −1
Original line number Diff line number Diff line
@@ -431,7 +431,7 @@ extern void *set_except_vector(int n, void *addr); 
extern void per_cpu_trap_init(void);



extern NORET_TYPE void __die(const char *, struct pt_regs *, const char *file,

	const char *func, unsigned long line);

	const char *func, unsigned long line) ATTRIB_NORET;

extern void __die_if_kernel(const char *, struct pt_regs *, const char *file,

	const char *func, unsigned long line);