From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Mon, 06 Feb 2012 23:09:57 -0600 Subject: [PATCH 2/3] ARM: make disable_fiq macro optional In-Reply-To: References: <1328562200-8810-1-git-send-email-robherring2@gmail.com> <1328562200-8810-3-git-send-email-robherring2@gmail.com> Message-ID: <4F30B225.60605@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Nicolas, On 02/06/2012 04:34 PM, Nicolas Pitre wrote: > On Mon, 6 Feb 2012, Rob Herring wrote: > >> From: Rob Herring >> >> 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. > That's already being done here: arch/arm/mach-rpc/dma.c:290: set_fiq_handler(fiqhandler_start, fiqhandler_length); Can the macro just be deleted? Or a default handler needs to be setup earlier? Rob > >> Signed-off-by: Rob Herring >> --- >> 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 >> #include >> #include >> +#ifndef CONFIG_MULTI_IRQ_HANDLER >> #include >> +#endif >> #include >> #include >> #include >> @@ -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 >>