proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ

[safe/jmp/linux-2.6] / fs / proc / stat.c

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index a13431a..3bb1cf1 100644 (file)
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -27,7 +27,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 +44,11 @@ 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)
+               for_each_irq_nr(j) {
+#ifdef CONFIG_SPARSE_IRQ
+                       if (!irq_to_desc(j))
                                continue;
+#endif
                        sum += kstat_irqs_cpu(j, i);
                }
                sum += arch_irq_stat_cpu(i);
@@ -92,14 +93,16 @@ 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);
+#ifdef CONFIG_SPARSE_IRQ
+               if (!irq_to_desc(j)) {
+                       seq_printf(p, " %u", per_irq_sum);
+                       continue;
                }
+#endif
+               for_each_possible_cpu(i)
+                       per_irq_sum += kstat_irqs_cpu(j, i);
 
                seq_printf(p, " %u", per_irq_sum);
        }