Commit 2be3b52a authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

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: default avatarThomas Gleixner <tglx@linutronix.de>
parent 811410fd

fs/proc/proc_misc.c

+2 −5
Original line number Diff line number Diff line
@@ -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)

include/linux/irq.h

+3 −0
Original line number Diff line number Diff line
@@ -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>