diff options
| author |   Markos Chandras <markos.chandras@imgtec.com> | 2013-05-09 09:42:46 +0100 |
|---|---|---|
| committer |   James Hogan <james.hogan@imgtec.com> | 2013-06-13 12:55:29 +0100 |
| commit | b79e88e55d5f8d141f205173ce30b4ef05e458c3 (patch) | |
| tree | 2255d15e4d078a7c9c14b0b9614c637b4a5cea30 | |
| parent | metag/processor.h: Add missing cpuinfo_op declaration. (diff) | |
| download | wireguard-linux-b79e88e55d5f8d141f205173ce30b4ef05e458c3.tar.xz wireguard-linux-b79e88e55d5f8d141f205173ce30b4ef05e458c3.zip | |
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>
| -rw-r--r-- | arch/metag/include/asm/bug.h | 4 | ||||
| -rw-r--r-- | arch/metag/kernel/traps.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/metag/include/asm/bug.h b/arch/metag/include/asm/bug.h index d04b48cefecc..9f8967f10f8c 100644 --- 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 2ceeaae5b199..a7051de20075 100644 --- 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; |