From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 3/4] ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
Date: Wed, 8 Feb 2012 19:33:38 -0600 [thread overview]
Message-ID: <1328751219-2552-4-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1328751219-2552-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
With the removal of disable_fiq on rpc and addition MULTI_IRQ_HANDLER,
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 | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 3a456c6..5558f56 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,6 @@ __stubs_start:
* get out of that mode without clobbering one register.
*/
vector_fiq:
- disable_fiq
subs pc, lr, #4
/*=============================================================================
--
1.7.5.4
next prev parent reply other threads:[~2012-02-09 1:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 1:33 [PATCH v2 0/4] entry-macro.S clean-up Rob Herring
2012-02-09 1:33 ` [PATCH v2 1/4] ARM: make arch_ret_to_user macro optional Rob Herring
2012-02-09 6:12 ` Nicolas Pitre
2012-02-09 1:33 ` [PATCH v2 2/4] ARM: rpc: make default fiq handler run-time installed Rob Herring
2012-02-09 6:33 ` Nicolas Pitre
2012-02-14 14:50 ` [PATCH v3] " Rob Herring
2012-02-14 17:37 ` Nicolas Pitre
2012-02-14 19:12 ` Rob Herring
2012-02-09 1:33 ` Rob Herring [this message]
2012-02-09 6:28 ` [PATCH v2 3/4] ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER Nicolas Pitre
2012-02-09 23:04 ` H Hartley Sweeten
2012-02-09 1:33 ` [PATCH v2 4/4] ARM: remove empty disable_fiq and arch_ret_to_user macros Rob Herring
2012-02-09 23:03 ` H Hartley Sweeten
2012-02-11 6:58 ` Shawn Guo
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=1328751219-2552-4-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.