From 83899ef3c4324f153d7b43d1908f7a919ce0bf96 Mon Sep 17 00:00:00 2001 From: KOSAKI Motohiro Date: Tue, 16 Dec 2008 00:23:34 -0800 Subject: [PATCH] --- yaml --- r: 123257 b: refs/heads/master c: 13bd41bc227a48d6cf8992a3286bf6eba3c71a0c h: refs/heads/master i: 123255: 74f8654c3cb5c7070528b4411f05c768ac54dbae v: v3 --- [refs] | 2 +- trunk/fs/proc/stat.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index fbe419827ad4..b62cbb36bdd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30cb367ea2be76bf71dbd275f38d0fd3b6f4142b +refs/heads/master: 13bd41bc227a48d6cf8992a3286bf6eba3c71a0c diff --git a/trunk/fs/proc/stat.c b/trunk/fs/proc/stat.c index 3cb9492801c0..3bb1cf1e7425 100644 --- a/trunk/fs/proc/stat.c +++ b/trunk/fs/proc/stat.c @@ -27,7 +27,6 @@ static int show_stat(struct seq_file *p, void *v) u64 sum = 0; struct timespec boottime; unsigned int per_irq_sum; - struct irq_desc *desc; user = nice = system = idle = iowait = irq = softirq = steal = cputime64_zero; @@ -47,8 +46,7 @@ static int show_stat(struct seq_file *p, void *v) guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest); for_each_irq_nr(j) { #ifdef CONFIG_SPARSE_IRQ - desc = irq_to_desc(j); - if (!desc) + if (!irq_to_desc(j)) continue; #endif sum += kstat_irqs_cpu(j, i); @@ -98,8 +96,7 @@ static int show_stat(struct seq_file *p, void *v) for_each_irq_nr(j) { per_irq_sum = 0; #ifdef CONFIG_SPARSE_IRQ - desc = irq_to_desc(j); - if (!desc) { + if (!irq_to_desc(j)) { seq_printf(p, " %u", per_irq_sum); continue; }