aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-16 09:33:18 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:53:30 -0400
commit4b1135a277f4b38f60b9c9f28adae467feb07856 (patch)
tree7014a4a687220ebe66dacb6ba75d37610d8279f3 /arch/arm
parent63d659d556f145d33798b8ad19ced10c254fe445 (diff)
genirq: fix name space collisions of nr_irqs in arch/*
local shadows of global variables are _bad_ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ixp2000/ixdp2x00.c4
-rw-r--r--arch/arm/mach-omap2/irq.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index b0653a87159a..30451300751b 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -143,7 +143,7 @@ static struct irq_chip ixdp2x00_cpld_irq_chip = {
143 .unmask = ixdp2x00_irq_unmask 143 .unmask = ixdp2x00_irq_unmask
144}; 144};
145 145
146void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs) 146void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_of_irqs)
147{ 147{
148 unsigned int irq; 148 unsigned int irq;
149 149
@@ -154,7 +154,7 @@ void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigne
154 154
155 board_irq_stat = stat_reg; 155 board_irq_stat = stat_reg;
156 board_irq_mask = mask_reg; 156 board_irq_mask = mask_reg;
157 board_irq_count = nr_irqs; 157 board_irq_count = nr_of_irqs;
158 158
159 *board_irq_mask = 0xffffffff; 159 *board_irq_mask = 0xffffffff;
160 160
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 196a9565a8dc..003901f1e2da 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -111,7 +111,7 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
111 111
112void __init omap_init_irq(void) 112void __init omap_init_irq(void)
113{ 113{
114 unsigned long nr_irqs = 0; 114 unsigned long nr_of_irqs = 0;
115 unsigned int nr_banks = 0; 115 unsigned int nr_banks = 0;
116 int i; 116 int i;
117 117
@@ -124,14 +124,14 @@ void __init omap_init_irq(void)
124 124
125 omap_irq_bank_init_one(bank); 125 omap_irq_bank_init_one(bank);
126 126
127 nr_irqs += bank->nr_irqs; 127 nr_of_irqs += bank->nr_irqs;
128 nr_banks++; 128 nr_banks++;
129 } 129 }
130 130
131 printk(KERN_INFO "Total of %ld interrupts on %d active controller%s\n", 131 printk(KERN_INFO "Total of %ld interrupts on %d active controller%s\n",
132 nr_irqs, nr_banks, nr_banks > 1 ? "s" : ""); 132 nr_of_irqs, nr_banks, nr_banks > 1 ? "s" : "");
133 133
134 for (i = 0; i < nr_irqs; i++) { 134 for (i = 0; i < nr_of_irqs; i++) {
135 set_irq_chip(i, &omap_irq_chip); 135 set_irq_chip(i, &omap_irq_chip);
136 set_irq_handler(i, handle_level_irq); 136 set_irq_handler(i, handle_level_irq);
137 set_irq_flags(i, IRQF_VALID); 137 set_irq_flags(i, IRQF_VALID);