ARM: make entry-macro.S depend on !MULTI_IRQ_HANDLER
authorRob Herring <rob.herring@calxeda.com>
Thu, 9 Feb 2012 00:26:34 +0000 (18:26 -0600)
committerRob Herring <rob.herring@calxeda.com>
Tue, 21 Feb 2012 23:04:59 +0000 (17:04 -0600)
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>
arch/arm/kernel/entry-armv.S

index be16a48007b4b79fc5db0d3e48b016242b68d760..22f0ed324f370b904279a349167ceba3a5ec8c5a 100644 (file)
@@ -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
 
 /*=============================================================================