Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26ddd8d5 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Ingo Molnar
Browse files

proc: remove ifdef CONFIG_SPARSE_IRQ from stat.c 



Impact: cleanup

irq_desc can be NULL when CONFIG_SPARSE_IRQ=y only.
therefore, NULL checking can move into kstat_irqs_cpu() of SPARSE_IRQ version.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: default avatar"Yinghai Lu" <yinghai@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f9af0e70

fs/proc/stat.c

+1 −10
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/seq_file.h>

#include <linux/slab.h>

#include <linux/time.h>

#include <linux/irqnr.h>

#include <asm/cputime.h>



#ifndef arch_irq_stat_cpu
@@ -45,10 +46,6 @@ 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_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);
@@ -95,12 +92,6 @@ static int show_stat(struct seq_file *p, void *v) 
	/* sum again ? it could be updated? */

	for_each_irq_nr(j) {

		per_irq_sum = 0;

#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);

kernel/irq/handle.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ void early_init_irq_lock_class(void) 
unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)

{

	struct irq_desc *desc = irq_to_desc(irq);

	return desc->kstat_irqs[cpu];

	return desc ? desc->kstat_irqs[cpu] : 0;

}

#endif

EXPORT_SYMBOL(kstat_irqs_cpu);