From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/3] ARM: make disable_fiq macro optional
Date: Mon, 6 Feb 2012 15:03:19 -0600 [thread overview]
Message-ID: <1328562200-8810-3-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1328562200-8810-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
Only rpc uses disable_fiq, so make its use conditional on ARCH_RPC.
With this, entry-macro.S is no longer needed for platforms that
select MULTI_IRQ_HANDLER and the include of it can be conditional.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/kernel/entry-armv.S | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 3a456c6..15caa06 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -19,7 +19,9 @@
#include <asm/glue-df.h>
#include <asm/glue-pf.h>
#include <asm/vfpmacros.h>
+#ifndef CONFIG_MULTI_IRQ_HANDLER
#include <mach/entry-macro.S>
+#endif
#include <asm/thread_notify.h>
#include <asm/unwind.h>
#include <asm/unistd.h>
@@ -1101,7 +1103,9 @@ __stubs_start:
* get out of that mode without clobbering one register.
*/
vector_fiq:
+#ifdef CONFIG_ARCH_RPC
disable_fiq
+#endif
subs pc, lr, #4
/*=============================================================================
--
1.7.5.4
next prev parent reply other threads:[~2012-02-06 21:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-06 21:03 [PATCH 0/3] entry-macro.S clean-up Rob Herring
2012-02-06 21:03 ` [PATCH 1/3] ARM: make arch_ret_to_user macro optional Rob Herring
2012-02-06 22:21 ` Nicolas Pitre
2012-02-06 21:03 ` Rob Herring [this message]
2012-02-06 22:34 ` [PATCH 2/3] ARM: make disable_fiq " Nicolas Pitre
2012-02-07 5:09 ` Rob Herring
2012-02-07 5:24 ` Nicolas Pitre
2012-02-07 22:52 ` Rob Herring
2012-02-08 8:38 ` Russell King - ARM Linux
2012-02-08 19:58 ` Rob Herring
2012-02-08 20:14 ` Nicolas Pitre
2012-02-08 20:30 ` Russell King - ARM Linux
2012-02-08 20:52 ` Nicolas Pitre
2012-02-06 21:03 ` [PATCH 3/3] ARM: remove empty disable_fiq and arch_ret_to_user macros Rob Herring
2012-02-06 21:34 ` Jamie Iles
2012-02-06 22:40 ` Nicolas Pitre
2012-02-06 23:01 ` Tony Lindgren
2012-02-07 5:10 ` Linus Walleij
2012-02-07 9:35 ` Nicolas Ferre
2012-02-06 22:22 ` [PATCH 0/3] entry-macro.S clean-up Ryan Mallon
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=1328562200-8810-3-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).