From 260c96738cf30f489108cd0fb3f10dcd11cbb5ca Mon Sep 17 00:00:00 2001 From: "Maciej W. Rozycki" Date: Thu, 16 Jun 2005 20:39:12 +0000 Subject: [PATCH] Mark __die() "noreturn" for real. Signed-off-by: Ralf Baechle --- arch/mips/kernel/traps.c | 5 +++-- include/asm-mips/system.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 9419a3542c24..b502dc970b35 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c @@ -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; diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h index ec29c9349e07..b9c24bbad9e2 100644 --- a/include/asm-mips/system.h +++ b/include/asm-mips/system.h @@ -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); -- 2.11.0