78ff18a412
arch/arm/kernel/entry-armv.S has contained a comment suggesting that asm/hardware.h and asm/arch/irqs.h should be moved into the asm/arch/entry-macro.S include. So move the includes to these two files as required. Add missing includes (asm/hardware.h, asm/io.h) to asm/arch/system.h includes which use those facilities, and remove asm/io.h from kernel/process.c. Remove other unnecessary includes from arch/arm/kernel, arch/arm/mm and arch/arm/mach-footbridge. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
42 lines
1,022 B
ArmAsm
42 lines
1,022 B
ArmAsm
/*
|
|
* include/asm-arm/arch-ixp4xx/entry-macro.S
|
|
*
|
|
* Low-level IRQ helper macros for IXP4xx-based platforms
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
#include <asm/hardware.h>
|
|
|
|
.macro disable_fiq
|
|
.endm
|
|
|
|
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
|
|
ldr \irqstat, =(IXP4XX_INTC_BASE_VIRT+IXP4XX_ICIP_OFFSET)
|
|
ldr \irqstat, [\irqstat] @ get interrupts
|
|
cmp \irqstat, #0
|
|
beq 1001f @ upper IRQ?
|
|
clz \irqnr, \irqstat
|
|
mov \base, #31
|
|
sub \irqnr, \base, \irqnr
|
|
b 1002f @ lower IRQ being
|
|
@ handled
|
|
|
|
1001:
|
|
/*
|
|
* IXP465 has an upper IRQ status register
|
|
*/
|
|
#if defined(CONFIG_CPU_IXP46X)
|
|
ldr \irqstat, =(IXP4XX_INTC_BASE_VIRT+IXP4XX_ICIP2_OFFSET)
|
|
ldr \irqstat, [\irqstat] @ get upper interrupts
|
|
mov \irqnr, #63
|
|
clz \irqstat, \irqstat
|
|
cmp \irqstat, #32
|
|
subne \irqnr, \irqnr, \irqstat
|
|
#endif
|
|
1002:
|
|
.endm
|
|
|
|
|