* Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [110127 04:21]:
> On Wed, Jan 26, 2011 at 10:12:16AM -0800, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [110126 00:57]:
> > > On Fri, Jan 07, 2011 at 08:56:26AM -0800, Tony Lindgren wrote:
> > > > > diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> > > > > index e66687b..c203204 100644
> > > > > --- a/arch/arm/mach-omap2/io.c
> > > > > +++ b/arch/arm/mach-omap2/io.c
> > > > > @@ -314,14 +314,13 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
> > > > > return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
> > > > > }
> > > > >
> > > > > +void __iomem *omap_irq_base;
> > > > > +
> > > > > /*
> > > > > * Initialize asm_irq_base for entry-macro.S
> > > > > */
> > > > > static inline void omap_irq_base_init(void)
> > > > > {
> > > > > - extern void __iomem *omap_irq_base;
> > > > > -
> > > > > -#ifdef MULTI_OMAP2
> > > > > if (cpu_is_omap24xx())
> > > > > omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE);
> > > > > else if (cpu_is_omap34xx())
> > > > > @@ -330,7 +329,6 @@ static inline void omap_irq_base_init(void)
> > > > > omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE);
> > > > > else
> > > > > pr_err("Could not initialize omap_irq_base\n");
> > > > > -#endif
> > > > > }
> > > > >
> > > > > void __init omap2_init_common_infrastructure(void)
> > > >
> > > > This looks good to me.
> > >
> > > I notice this one is still there.
> >
> > Sorry I thought you'll queue this one.
> >
> > BTW this fixes regression from patch 5d190c40100793a6dfc37bf325677c10f3c80edf
> > (omap2+: Initialize omap_irq_base for entry-macro.S from platform code).
> > So it should be OK for the -rc cycle:
> >
> > Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> >
> > Let me know if you want me to take it, in that case I think it's still
> > missing your Signed-off-by.
>
> Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
>
> > Let me know if you want me to queue it.
>
> Yes please.
OK here's I've queued. I updated the comments a bit.
Will also post a similar change for omap1.
Tony
From: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Date: Fri, 7 Jan 2011 11:57:44 +0000
Subject: [PATCH] omap2+: Fix unused variable warning for omap_irq_base
Commit 5d190c40100793a6dfc37bf325677c10f3c80edf
(omap2+: Initialize omap_irq_base for entry-macro.S from
platform code) simplified the handling of omap_irq_base
for multi-omap builds. However, this patch also introduced
a build warning for !MULTI_OMAP2 builds:
arch/arm/mach-omap2/io.c: In function 'omap_irq_base_init':
arch/arm/mach-omap2/io.c:322: warning: unused variable 'omap_irq_base'
Fix this by removing the ifdef. Also simplify things further
by moving omap_irq_base out of entry-macro.S.
Signed-off-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
[tony@xxxxxxxxxxx: updated comments]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
--- a/arch/arm/mach-omap2/include/mach/entry-macro.S
+++ b/arch/arm/mach-omap2/include/mach/entry-macro.S
@@ -38,20 +38,6 @@
*/
#ifdef MULTI_OMAP2
-
-/*
- * We use __glue to avoid errors with multiple definitions of
- * .globl omap_irq_base as it's included from entry-armv.S but not
- * from entry-common.S.
- */
-#ifdef __glue
- .pushsection .data
- .globl omap_irq_base
-omap_irq_base:
- .word 0
- .popsection
-#endif
-
/*
* Configure the interrupt base on the first interrupt.
* See also omap_irq_base_init for setting omap_irq_base.
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -314,14 +314,13 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);
}
+void __iomem *omap_irq_base;
+
/*
* Initialize asm_irq_base for entry-macro.S
*/
static inline void omap_irq_base_init(void)
{
- extern void __iomem *omap_irq_base;
-
-#ifdef MULTI_OMAP2
if (cpu_is_omap24xx())
omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE);
else if (cpu_is_omap34xx())
@@ -330,7 +329,6 @@ static inline void omap_irq_base_init(void)
omap_irq_base = OMAP2_L4_IO_ADDRESS(OMAP44XX_GIC_CPU_BASE);
else
pr_err("Could not initialize omap_irq_base\n");
-#endif
}
void __init omap2_init_common_infrastructure(void)
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
