diff options
| author |   KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2008-12-26 14:24:10 +0900 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-12-26 09:48:18 +0100 |
| commit | 26ddd8d5cac8a563953d5febe8c6e40909f7bce1 (patch) | |
| tree | 1e13087c68aeb1fc7da6126a4452869c368e2a93 | |
| parent | irq: for_each_irq_desc() move to irqnr.h (diff) | |
| download | linux-dev-26ddd8d5cac8a563953d5febe8c6e40909f7bce1.tar.xz linux-dev-26ddd8d5cac8a563953d5febe8c6e40909f7bce1.zip | |
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: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: "Yinghai Lu" <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | fs/proc/stat.c | 11 | ||||
| -rw-r--r-- | kernel/irq/handle.c | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c index 3bb1cf1e7425..f75efa22df5e 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -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); diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 4db7d2df86b6..03479dfdebb8 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -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); |