summaryrefslogtreecommitdiffstats
path: root/fs/proc/stat.c
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2008-12-16 00:23:34 -0800
committerIngo Molnar <mingo@elte.hu>2008-12-16 11:24:14 +0100
commit13bd41bc227a48d6cf8992a3286bf6eba3c71a0c (patch)
treec817813280a7fec083edc0b74989f057f17c28be /fs/proc/stat.c
parent30cb367ea2be76bf71dbd275f38d0fd3b6f4142b (diff)
downloadop-kernel-dev-13bd41bc227a48d6cf8992a3286bf6eba3c71a0c.zip
op-kernel-dev-13bd41bc227a48d6cf8992a3286bf6eba3c71a0c.tar.gz
proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ
Impact: restructure code to fix compiler warning commit 240d367b4e6c6e3c5075e034db14dba60a6f5fa7 moved desc usage point into #ifdef CONFIG_SPARSE_IRQ. Eliminate the desc variable, otherwise following warning happens: fs/proc/stat.c: In function 'show_stat': fs/proc/stat.c:31: warning: unused variable 'desc' [ akpm: cleaned up the patch to remove #ifdef ] Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/proc/stat.c')
-rw-r--r--fs/proc/stat.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 3cb9492..3bb1cf1 100644
--- a/fs/proc/stat.c
+++ b/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;
}
OpenPOWER on IntegriCloud