From fdc29992aafde23d3c8810493747810da18d058e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 16 Oct 2008 14:50:27 +0200 Subject: [PATCH] --- yaml --- r: 116551 b: refs/heads/master c: 2be3b52a5785a6a5c5349fbd315f57595f7074be h: refs/heads/master i: 116549: ea771c7c930964dd57f6017772b38f8a0ad54bf7 116547: 402c678e7b65195465fe4c87bbaa0d0566e67337 116543: d8d97848fe283741621f48d6d8e5c8671884dd86 v: v3 --- [refs] | 2 +- trunk/fs/proc/proc_misc.c | 7 ++----- trunk/include/linux/irq.h | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0357eeaef978..0350496cde73 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 811410fdb6b9d82a518542289efe9b2a51e3cbfb +refs/heads/master: 2be3b52a5785a6a5c5349fbd315f57595f7074be diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index 3f5c7b9d1a70..97b4579134d5 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/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/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index 31632aa65d16..0618fb362cb4 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/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