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

Commit efe318a3 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap1: Simplify use of omap_irq_flags 



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

Commit 9f9605c2
(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: default avatarTony Lindgren <tony@atomide.com>
parent 9f9605c2

arch/arm/mach-omap1/include/mach/entry-macro.S

+0 −13
Original line number Diff line number Diff line
@@ -14,19 +14,6 @@ 
#include <mach/irqs.h>

#include <asm/hardware/gic.h>



/*

 * We use __glue to avoid errors with multiple definitions of

 * .globl omap_irq_flags as it's included from entry-armv.S but not

 * from entry-common.S.

 */

#ifdef __glue

		.pushsection .data

		.globl	omap_irq_flags

omap_irq_flags:

		.word	0

		.popsection

#endif



 		.macro	disable_fiq

		.endm

arch/arm/mach-omap1/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ struct omap_irq_bank { 
	unsigned long wake_enable;

};



u32 omap_irq_flags;

static unsigned int irq_bank_count;

static struct omap_irq_bank *irq_banks;
@@ -176,7 +177,6 @@ static struct irq_chip omap_irq_chip = { 


void __init omap_init_irq(void)

{

	extern unsigned int omap_irq_flags;

	int i, j;



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)