summaryrefslogtreecommitdiffstats
path: root/arch/metag/include/asm/bug.h
diff options
context:
space:
mode:
authorMarkos Chandras2013-05-09 10:42:46 +0200
committerJames Hogan2013-06-13 13:55:29 +0200
commitb79e88e55d5f8d141f205173ce30b4ef05e458c3 (patch)
tree2255d15e4d078a7c9c14b0b9614c637b4a5cea30 /arch/metag/include/asm/bug.h
parentmetag/processor.h: Add missing cpuinfo_op declaration. (diff)
downloadkernel-qcow2-linux-b79e88e55d5f8d141f205173ce30b4ef05e458c3.tar.gz
kernel-qcow2-linux-b79e88e55d5f8d141f205173ce30b4ef05e458c3.tar.xz
kernel-qcow2-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>
Diffstat (limited to 'arch/metag/include/asm/bug.h')
-rw-r--r--arch/metag/include/asm/bug.h4
1 files changed, 2 insertions, 2 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