Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 243c8654 authored by Rob Herring's avatar Rob Herring
Browse files

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: default avatarRob Herring <rob.herring@calxeda.com>
Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
parent 78cbaaca

arch/arm/kernel/entry-armv.S

+2 −1
Original line number Diff line number Diff line
@@ -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



/*=============================================================================