[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-head
Subject:    omap1: Simplify use of omap_irq_flags
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2011-01-31 22:59:49
Message-ID: 201101312259.p0VMxn0X004406 () hera ! kernel ! org
[Download RAW message or body]

Gitweb:     http://git.kernel.org/linus/efe318a333767cbd20746f8d57f3ca7e398d9255
Commit:     efe318a333767cbd20746f8d57f3ca7e398d9255
Parent:     9f9605c2eda9679e6f63c605cbd9cbf6a9a7f3fa
Author:     Tony Lindgren <tony@atomide.com>
AuthorDate: Thu Jan 27 15:52:16 2011 -0800
Committer:  Tony Lindgren <tony@atomide.com>
CommitDate: Thu Jan 27 15:52:16 2011 -0800

    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>
---
 arch/arm/mach-omap1/include/mach/entry-macro.S |   13 -------------
 arch/arm/mach-omap1/irq.c                      |    2 +-
 2 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/arch/arm/mach-omap1/include/mach/entry-macro.S \
b/arch/arm/mach-omap1/include/mach/entry-macro.S index c9be6d4..bfb4fb1 100644
--- a/arch/arm/mach-omap1/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap1/include/mach/entry-macro.S
@@ -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
 
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 4770158..731dd33 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -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)
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]