From: James Hogan <james.hogan@imgtec.com>
To: <linux-kernel@vger.kernel.org>
Cc: Markos Chandras <markos.chandras@imgtec.com>,
James Hogan <james.hogan@imgtec.com>
Subject: [PATCH 08/10] metag/traps: Mark die() as __noreturn to match the declaration.
Date: Thu, 13 Jun 2013 13:19:39 +0100 [thread overview]
Message-ID: <1371125981-5184-9-git-send-email-james.hogan@imgtec.com> (raw)
In-Reply-To: <1371125981-5184-1-git-send-email-james.hogan@imgtec.com>
From: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: James Hogan <james.hogan@imgtec.com>
---
arch/metag/include/asm/bug.h | 4 ++--
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 d04b48c..9f8967f 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 2ceeaae..a7051de 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;
--
1.8.1.2
next prev parent reply other threads:[~2013-06-13 12:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-13 12:19 [PATCH 00/10] metag: various patches for v3.11 James Hogan
2013-06-13 12:19 ` [PATCH 01/10] metag: init common clk and use "core" clk James Hogan
2013-06-13 12:19 ` [PATCH 02/10] metag: log core and timer frequencies from arch code James Hogan
2013-06-13 12:19 ` [PATCH 03/10] metag/kernel/irq.c: Declare root_domain as static James Hogan
2013-06-13 12:19 ` [PATCH 04/10] metag/asm/irq.h: Declare init_IRQ James Hogan
2013-06-13 12:19 ` [PATCH 05/10] metag/mm/cache: Restrict scope for metag_lnkget_probe James Hogan
2013-06-13 12:19 ` [PATCH 06/10] metag/setup: Restrict scope for the capabilities variable James Hogan
2013-06-13 12:19 ` [PATCH 07/10] metag/processor.h: Add missing cpuinfo_op declaration James Hogan
2013-06-13 12:19 ` James Hogan [this message]
2013-06-13 12:19 ` [PATCH 09/10] metag/traps: include setup.h for the per_cpu_trap_init declaration James Hogan
2013-06-13 12:19 ` [PATCH 10/10] metag/.gitignore: Extend the *.dtb pattern to match the dtb.S files James Hogan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371125981-5184-9-git-send-email-james.hogan@imgtec.com \
--to=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markos.chandras@imgtec.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®