diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2012-02-08 18:26:34 -0600 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2012-02-21 17:04:59 -0600 |
| commit | 243c86542aeeb41d9ab78d3aa44fa6b4854fdb67 (patch) | |
| tree | ce65cb255465eee0aa03fc09711ea2be6e592e0c /arch/arm/kernel/entry-armv.S | |
| parent | 78cbaaca6908c2ddf1bd26cf58c408938654e3d8 (diff) | |
| download | linux-243c86542aeeb41d9ab78d3aa44fa6b4854fdb67.tar.bz2 | |
ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
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>
Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | 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 be16a48007b4..22f0ed324f37 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 /*============================================================================= |