[PATCH 2/3] ARM: make disable_fiq macro optional

[Nicolas Pitre]

On Mon, 6 Feb 2012, Rob Herring wrote:

> From: Rob Herring <rob.herring at calxeda.com>
> 
> Only rpc uses disable_fiq, so make its use conditional on ARCH_RPC.
> 
> With this, entry-macro.S is no longer needed for platforms that
> select MULTI_IRQ_HANDLER and the include of it can be conditional.

Using set_fiq_handler() in the rpc boot code we could get rid of 
disable_fiq entirely.


> Signed-off-by: Rob Herring <rob.herring at calxeda.com>
> ---
>  arch/arm/kernel/entry-armv.S |    4 ++++
>  1 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> index 3a456c6..15caa06 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,9 @@ __stubs_start:
>   * get out of that mode without clobbering one register.
>   */
>  vector_fiq:
> +#ifdef CONFIG_ARCH_RPC
>  	disable_fiq
> +#endif
>  	subs	pc, lr, #4
>  
>  /*=============================================================================
> -- 
> 1.7.5.4
>