CVS Update@linux-mips.org: linux

[macro@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     macro@ftp.linux-mips.org        05/06/16 21:39:14

Modified files:
        arch/mips/kernel: traps.c 
        include/asm-mips: system.h 

Log message:
        Mark __die() "noreturn" for real.

diff -urN linux/arch/mips/kernel/traps.c linux/arch/mips/kernel/traps.c
--- linux/arch/mips/kernel/traps.c      2005/05/31 11:49:19     1.215
+++ linux/arch/mips/kernel/traps.c      2005/06/16 20:39:12     1.216
@@ -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;
 
diff -urN linux/include/asm-mips/system.h linux/include/asm-mips/system.h
--- linux/include/asm-mips/system.h     2005/06/14 17:35:06     1.83
+++ linux/include/asm-mips/system.h     2005/06/16 20:39:14     1.84
@@ -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);