From 83bd52e59ae8df688153053b89e62d0af9859a4c Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Tue, 15 Nov 2011 17:22:45 +0000 Subject: [PATCH] --- yaml --- r: 279836 b: refs/heads/master c: ab65be268adaae59da5b1306b425a7859f955669 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/include/mach/omap4-common.h | 2 -- trunk/arch/arm/mach-omap2/io.c | 3 --- trunk/arch/arm/mach-omap2/irq.c | 1 + trunk/arch/arm/mach-omap2/omap4-common.c | 6 +++--- trunk/arch/arm/plat-omap/include/plat/irqs.h | 1 - 6 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c11893056166..d78df78e1420 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b2f55d7851aa358d3a99cff344c560c4967f042 +refs/heads/master: ab65be268adaae59da5b1306b425a7859f955669 diff --git a/trunk/arch/arm/mach-omap2/include/mach/omap4-common.h b/trunk/arch/arm/mach-omap2/include/mach/omap4-common.h index e4bd87619734..e7c85a9a472e 100644 --- a/trunk/arch/arm/mach-omap2/include/mach/omap4-common.h +++ b/trunk/arch/arm/mach-omap2/include/mach/omap4-common.h @@ -28,8 +28,6 @@ extern void __iomem *l2cache_base; #endif -extern void __iomem *gic_dist_base_addr; - extern void __init gic_init_irq(void); extern void omap_smc1(u32 fn, u32 arg); diff --git a/trunk/arch/arm/mach-omap2/io.c b/trunk/arch/arm/mach-omap2/io.c index 25d20ced03e1..547f83145e30 100644 --- a/trunk/arch/arm/mach-omap2/io.c +++ b/trunk/arch/arm/mach-omap2/io.c @@ -316,9 +316,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) return omap_hwmod_set_postsetup_state(oh, *(u8 *)data); } -/* See irq.c, omap4-common.c and entry-macro.S */ -void __iomem *omap_irq_base; - static void __init omap_common_init_early(void) { omap2_check_revision(); diff --git a/trunk/arch/arm/mach-omap2/irq.c b/trunk/arch/arm/mach-omap2/irq.c index ec52bee0e089..42b1d6591912 100644 --- a/trunk/arch/arm/mach-omap2/irq.c +++ b/trunk/arch/arm/mach-omap2/irq.c @@ -149,6 +149,7 @@ omap_alloc_gc(void __iomem *base, unsigned int irq_start, unsigned int num) static void __init omap_init_irq(u32 base, int nr_irqs) { + void __iomem *omap_irq_base; unsigned long nr_of_irqs = 0; unsigned int nr_banks = 0; int i, j; diff --git a/trunk/arch/arm/mach-omap2/omap4-common.c b/trunk/arch/arm/mach-omap2/omap4-common.c index 35ac3e5f6e94..073f12a666a4 100644 --- a/trunk/arch/arm/mach-omap2/omap4-common.c +++ b/trunk/arch/arm/mach-omap2/omap4-common.c @@ -28,11 +28,11 @@ void __iomem *l2cache_base; #endif -void __iomem *gic_dist_base_addr; - - void __init gic_init_irq(void) { + void __iomem *omap_irq_base; + void __iomem *gic_dist_base_addr; + /* Static mapping, never released */ gic_dist_base_addr = ioremap(OMAP44XX_GIC_DIST_BASE, SZ_4K); BUG_ON(!gic_dist_base_addr); diff --git a/trunk/arch/arm/plat-omap/include/plat/irqs.h b/trunk/arch/arm/plat-omap/include/plat/irqs.h index 8b19a63fab68..90b95dd2064e 100644 --- a/trunk/arch/arm/plat-omap/include/plat/irqs.h +++ b/trunk/arch/arm/plat-omap/include/plat/irqs.h @@ -437,7 +437,6 @@ #define INTCPS_NR_IRQS 96 #ifndef __ASSEMBLY__ -extern void __iomem *omap_irq_base; void omap1_init_irq(void); void omap2_init_irq(void); void omap3_init_irq(void);