drivers/net/wan: fix sparse warning: symbol shadows an earlier one

[linux-2.6-omap-h63xx.git] / fs / proc / stat.c

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index a13431ab7c653ed53243e17516665d94a3323363..f75efa22df5ee39eba1e23f4998ed01567e35b8f 100644 (file)
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -9,6 +9,7 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 #include <linux/time.h>
+#include <linux/irqnr.h>
 #include <asm/cputime.h>
 
 #ifndef arch_irq_stat_cpu
@@ -27,7 +28,6 @@ static int show_stat(struct seq_file *p, void *v)
        u64 sum = 0;
        struct timespec boottime;
        unsigned int per_irq_sum;
-       struct irq_desc *desc;
 
        user = nice = system = idle = iowait =
                irq = softirq = steal = cputime64_zero;
@@ -45,9 +45,7 @@ static int show_stat(struct seq_file *p, void *v)
                softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
                steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
                guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
-               for_each_irq_desc(j, desc) {
-                       if (!desc)
-                               continue;
+               for_each_irq_nr(j) {
                        sum += kstat_irqs_cpu(j, i);
                }
                sum += arch_irq_stat_cpu(i);
@@ -92,14 +90,10 @@ static int show_stat(struct seq_file *p, void *v)
        seq_printf(p, "intr %llu", (unsigned long long)sum);
 
        /* sum again ? it could be updated? */
-       for (j = 0; j < NR_IRQS; j++) {
-               desc = irq_to_desc(j);
+       for_each_irq_nr(j) {
                per_irq_sum = 0;
-
-               if (desc) {
-                       for_each_possible_cpu(i)
-                               per_irq_sum += kstat_irqs_cpu(j, i);
-               }
+               for_each_possible_cpu(i)
+                       per_irq_sum += kstat_irqs_cpu(j, i);
 
                seq_printf(p, " %u", per_irq_sum);
        }