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>
This commit is contained in:
parent
78cbaaca69
commit
243c86542a
|
@ -19,7 +19,9 @@
|
||||||
#include <asm/glue-df.h>
|
#include <asm/glue-df.h>
|
||||||
#include <asm/glue-pf.h>
|
#include <asm/glue-pf.h>
|
||||||
#include <asm/vfpmacros.h>
|
#include <asm/vfpmacros.h>
|
||||||
|
#ifndef CONFIG_MULTI_IRQ_HANDLER
|
||||||
#include <mach/entry-macro.S>
|
#include <mach/entry-macro.S>
|
||||||
|
#endif
|
||||||
#include <asm/thread_notify.h>
|
#include <asm/thread_notify.h>
|
||||||
#include <asm/unwind.h>
|
#include <asm/unwind.h>
|
||||||
#include <asm/unistd.h>
|
#include <asm/unistd.h>
|
||||||
|
@ -1101,7 +1103,6 @@ __stubs_start:
|
||||||
* get out of that mode without clobbering one register.
|
* get out of that mode without clobbering one register.
|
||||||
*/
|
*/
|
||||||
vector_fiq:
|
vector_fiq:
|
||||||
disable_fiq
|
|
||||||
subs pc, lr, #4
|
subs pc, lr, #4
|
||||||
|
|
||||||
/*=============================================================================
|
/*=============================================================================
|
||||||
|
|
Loading…
Reference in New Issue