openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Markos Chandras 2013-05-09 09:42:46 +01:00 committed by James Hogan
parent dca66a61cb
commit b79e88e55d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/metag/include/asm/bug.h
View File

@ -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

4
arch/metag/kernel/traps.c
View File

@ -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;