omap1: Simplify use of omap_irq_flags

Commit 03a9e5126147c9f92aeba4b34f62b15b625087fb
(omap1: Use asm_irq_flags for entry-macro.S) added support
for multi-omap builds with addition of the omap_irq_flags.

Commit 9f9605c2eda9679e6f63c605cbd9cbf6a9a7f3fa
(omap2+: Fix unused variable warning for omap_irq_base)
simplified omap2+ entry-macro.S by moving omap_irq_flags
out of entry-macro.S.

Simplify omap1 entry-macro.S in a similar way to keep the
code consistent. Based on a similar earlier patch for omap2+
by Russell King <rmk+kernel@arm.linux.org.uk>.

Signed-off-by: Tony Lindgren <tony@atomide.com>

+1 -14
-13
arch/arm/mach-omap1/include/mach/entry-macro.S
··· 14 14 #include <mach/irqs.h> 15 15 #include <asm/hardware/gic.h> 16 16 17 - /* 18 - * We use __glue to avoid errors with multiple definitions of 19 - * .globl omap_irq_flags as it's included from entry-armv.S but not 20 - * from entry-common.S. 21 - */ 22 - #ifdef __glue 23 - .pushsection .data 24 - .globl omap_irq_flags 25 - omap_irq_flags: 26 - .word 0 27 - .popsection 28 - #endif 29 - 30 17 .macro disable_fiq 31 18 .endm 32 19
+1 -1
arch/arm/mach-omap1/irq.c
··· 57 57 unsigned long wake_enable; 58 58 }; 59 59 60 + u32 omap_irq_flags; 60 61 static unsigned int irq_bank_count; 61 62 static struct omap_irq_bank *irq_banks; 62 63 ··· 177 176 178 177 void __init omap_init_irq(void) 179 178 { 180 - extern unsigned int omap_irq_flags; 181 179 int i, j; 182 180 183 181 #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)