aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-16 08:50:27 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-16 10:53:30 -0400
commit2be3b52a5785a6a5c5349fbd315f57595f7074be (patch)
tree80654edb89a223f86b66519c1d9f12121ce09b34 /fs/proc
parent811410fdb6b9d82a518542289efe9b2a51e3cbfb (diff)
proc: fixup irq iterator
There is no need for irq_desc here. Even for sparse_irq we can handle this clever in for_each_irq_nr(). Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/proc')
-rw-r--r--fs/proc/proc_misc.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 3f5c7b9d1a70..97b4579134d5 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -509,9 +509,6 @@ static int show_stat(struct seq_file *p, void *v)
509 u64 sum = 0; 509 u64 sum = 0;
510 struct timespec boottime; 510 struct timespec boottime;
511 unsigned int per_irq_sum; 511 unsigned int per_irq_sum;
512#ifdef CONFIG_GENERIC_HARDIRQS
513 struct irq_desc *desc;
514#endif
515 512
516 user = nice = system = idle = iowait = 513 user = nice = system = idle = iowait =
517 irq = softirq = steal = cputime64_zero; 514 irq = softirq = steal = cputime64_zero;
@@ -530,7 +527,7 @@ static int show_stat(struct seq_file *p, void *v)
530 steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal); 527 steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
531 guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); 528 guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
532 529
533 for_each_irq_desc(j, desc) 530 for_each_irq_nr(j)
534 sum += kstat_irqs_cpu(j, i); 531 sum += kstat_irqs_cpu(j, i);
535 532
536 sum += arch_irq_stat_cpu(i); 533 sum += arch_irq_stat_cpu(i);
@@ -575,7 +572,7 @@ static int show_stat(struct seq_file *p, void *v)
575 seq_printf(p, "intr %llu", (unsigned long long)sum); 572 seq_printf(p, "intr %llu", (unsigned long long)sum);
576 573
577 /* sum again ? it could be updated? */ 574 /* sum again ? it could be updated? */
578 for_each_irq_desc(j, desc) { 575 for_each_irq_nr(j) {
579 per_irq_sum = 0; 576 per_irq_sum = 0;
580 577
581 for_each_possible_cpu(i) 578 for_each_possible_cpu(i)