commit 260c96738cf30f489108cd0fb3f10dcd11cbb5ca
author Maciej W. Rozycki <macro@linux-mips.org> Thu Jun 16 20:39:12 2005 +0000
committer Ralf Baechle <ralf@linux-mips.org> Sat Oct 29 19:31:26 2005 +0100
tree f9e72b1bf084ad2d38487fa8fc7dae01660dc08e
parent 778220f7c4a3357f7464a45044fd4937126ba6c5

Mark __die() "noreturn" for real.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

arch/mips/kernel/traps.c

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 9419a35..b502dc97 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -254,8 +254,9 @@
 
 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

diff --git a/include/asm-mips/system.h b/include/asm-mips/system.h
index ec29c93..b9c24bb 100644
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -431,7 +431,7 @@
 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);