Skip to content

Commit

Permalink
proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ
Browse files Browse the repository at this point in the history
Impact: restructure code to fix compiler warning

commit 240d367 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>
  • Loading branch information
KOSAKI Motohiro authored and Ingo Molnar committed Dec 16, 2008
1 parent 30cb367 commit 13bd41b
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions fs/proc/stat.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 13bd41b

Please sign in to comment.