aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-10-16 14:50:27 +0200
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:30 +0200
commit2be3b52a5785a6a5c5349fbd315f57595f7074be (patch)
tree80654edb89a223f86b66519c1d9f12121ce09b34
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>
-rw-r--r--fs/proc/proc_misc.c7
-rw-r--r--include/linux/irq.h3
2 files changed, 5 insertions, 5 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 3f5c7b9d1a7..97b4579134d 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)
u64 sum = 0;
struct timespec boottime;
unsigned int per_irq_sum;
-#ifdef CONFIG_GENERIC_HARDIRQS
- struct irq_desc *desc;
-#endif
user = nice = system = idle = iowait =
irq = softirq = steal = cputime64_zero;
@@ -530,7 +527,7 @@ static int show_stat(struct seq_file *p, void *v)
steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
- for_each_irq_desc(j, desc)
+ for_each_irq_nr(j)
sum += kstat_irqs_cpu(j, i);
sum += arch_irq_stat_cpu(i);
@@ -575,7 +572,7 @@ 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_each_irq_desc(j, desc) {
+ for_each_irq_nr(j) {
per_irq_sum = 0;
for_each_possible_cpu(i)
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 31632aa65d1..0618fb362cb 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -27,6 +27,9 @@ extern int nr_irqs;
irq > 0; irq--, desc--)
#endif
+#define for_each_irq_nr(irq) \
+ for (irq = 0; irq < nr_irqs; irq++)
+
#ifndef CONFIG_S390
#include <linux/linkage.h>