summaryrefslogtreecommitdiffstats
path: root/arch/metag/kernel
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2013-05-09 09:42:46 +0100
committerJames Hogan <james.hogan@imgtec.com>2013-06-13 12:55:29 +0100
commitb79e88e55d5f8d141f205173ce30b4ef05e458c3 (patch)
tree2255d15e4d078a7c9c14b0b9614c637b4a5cea30 /arch/metag/kernel
parentdca66a61cb3c82ebc86f1f99c22550b0ed7b3fbe (diff)
downloadblackbird-op-linux-b79e88e55d5f8d141f205173ce30b4ef05e458c3.tar.gz
blackbird-op-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/kernel')
-rw-r--r--arch/metag/kernel/traps.c4
1 files changed, 2 insertions, 2 deletions
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;
OpenPOWER on IntegriCloud