Browse Source

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>
Markos Chandras 12 years ago
parent
commit
b79e88e55d
2 changed files with 4 additions and 4 deletions
  1. 2 2
      arch/metag/include/asm/bug.h
  2. 2 2
      arch/metag/kernel/traps.c

+ 2 - 2
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

+ 2 - 2
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;