metag/traps: Mark die() as __noreturn to match the declaration.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>

diff --git a/arch/metag/include/asm/bug.h b/arch/metag/include/asm/bug.h
index d04b48cefecc7b388898f47ceac4cf9560d2af14..9f8967f10f8cf20bd1f208d715da24e7ecf30e0a 100644 (file)
--- a/arch/metag/include/asm/bug.h
+++ b/arch/metag/include/asm/bug.h
@@ -6,7 +6,7 @@
 struct pt_regs;
 
 extern const char *trap_name(int trapno);
-extern void die(const char *str, struct pt_regs *regs, long err,
-               unsigned long addr) __attribute__ ((noreturn));
+extern void __noreturn die(const char *str, struct pt_regs *regs, long err,
+               unsigned long addr);
 
 #endif

diff --git a/arch/metag/kernel/traps.c b/arch/metag/kernel/traps.c
index 2ceeaae5b1992e11a731c6eba9450a8dece9aeb3..a7051de2007533c2f7f5116bd68ef7f4ce4870ad 100644 (file)
--- a/arch/metag/kernel/traps.c
+++ b/arch/metag/kernel/traps.c
@@ -87,8 +87,8 @@ const char *trap_name(int trapno)
 
 static DEFINE_SPINLOCK(die_lock);
 
-void die(const char *str, struct pt_regs *regs, long err,
-        unsigned long addr)
+void __noreturn die(const char *str, struct pt_regs *regs,
+                   long err, unsigned long addr)
 {
        static int die_counter;