From: Maciej W. Rozycki <macro@linux-mips.org>
Date: Thu, 16 Jun 2005 20:39:12 +0000 (+0000)
Subject: Mark __die() "noreturn" for real.
X-Git-Tag: v2.6.15-rc1~731^2~1^2~185
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=260c96738cf30f489108cd0fb3f10dcd11cbb5ca;p=linux-2.6

Mark __die() "noreturn" for real.

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

diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 9419a3542c..b502dc970b 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 ec29c9349e..b9c24bbad9 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);