* [mmotm][PATCH] proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ @ 2008-12-16 8:00 KOSAKI Motohiro 2008-12-16 8:22 ` Andrew Morton 0 siblings, 1 reply; 4+ messages in thread From: KOSAKI Motohiro @ 2008-12-16 8:00 UTC (permalink / raw) To: Yinghai Lu, Ingo Molnar, LKML, Andrew Morton; +Cc: kosaki.motohiro Applied after: linux-next.patch == commit 240d367b4e6c6e3c5075e034db14dba60a6f5fa7 moved desc usage point into #ifdef CONFIG_SPARSE_IRQ. Then, variable declaration also shold be enclosed. otherwise following warning happend. fs/proc/stat.c: In function 'show_stat': fs/proc/stat.c:31: warning: unused variable 'desc' Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> CC: Yinghai Lu <yinghai@kernel.org> CC: Ingo Molnar <mingo@elte.hu> --- fs/proc/stat.c | 2 ++ 1 file changed, 2 insertions(+) Index: b/fs/proc/stat.c =================================================================== --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -28,7 +28,9 @@ static int show_stat(struct seq_file *p, u64 sum_softirq = 0; struct timespec boottime; unsigned int per_irq_sum; +#ifdef CONFIG_SPARSE_IRQ struct irq_desc *desc; +#endif user = nice = system = idle = iowait = irq = softirq = steal = cputime64_zero; ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [mmotm][PATCH] proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ 2008-12-16 8:00 [mmotm][PATCH] proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ KOSAKI Motohiro @ 2008-12-16 8:22 ` Andrew Morton 2008-12-16 8:25 ` KOSAKI Motohiro 0 siblings, 1 reply; 4+ messages in thread From: Andrew Morton @ 2008-12-16 8:22 UTC (permalink / raw) To: KOSAKI Motohiro; +Cc: Yinghai Lu, Ingo Molnar, LKML On Tue, 16 Dec 2008 17:00:30 +0900 (JST) KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> wrote: > Applied after: linux-next.patch > == > commit 240d367b4e6c6e3c5075e034db14dba60a6f5fa7 moved desc usage point into > #ifdef CONFIG_SPARSE_IRQ. > Then, variable declaration also shold be enclosed. otherwise following warning happend. > > fs/proc/stat.c: In function 'show_stat': > fs/proc/stat.c:31: warning: unused variable 'desc' > > > Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> > CC: Yinghai Lu <yinghai@kernel.org> > CC: Ingo Molnar <mingo@elte.hu> > --- > fs/proc/stat.c | 2 ++ > 1 file changed, 2 insertions(+) > > Index: b/fs/proc/stat.c > =================================================================== > --- a/fs/proc/stat.c > +++ b/fs/proc/stat.c > @@ -28,7 +28,9 @@ static int show_stat(struct seq_file *p, > u64 sum_softirq = 0; > struct timespec boottime; > unsigned int per_irq_sum; > +#ifdef CONFIG_SPARSE_IRQ > struct irq_desc *desc; > +#endif > > user = nice = system = idle = iowait = > irq = softirq = steal = cputime64_zero; > This would be better, no? --- a/fs/proc/stat.c~proc-enclose-desc-variable-of-show_stat-in-config_sparse_irq +++ a/fs/proc/stat.c @@ -28,7 +28,6 @@ static int show_stat(struct seq_file *p, u64 sum_softirq = 0; struct timespec boottime; unsigned int per_irq_sum; - struct irq_desc *desc; user = nice = system = idle = iowait = irq = softirq = steal = cputime64_zero; @@ -48,8 +47,7 @@ static int show_stat(struct seq_file *p, 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); @@ -103,8 +101,7 @@ static int show_stat(struct seq_file *p, 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; } _ ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [mmotm][PATCH] proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ 2008-12-16 8:22 ` Andrew Morton @ 2008-12-16 8:25 ` KOSAKI Motohiro 2008-12-16 10:25 ` Ingo Molnar 0 siblings, 1 reply; 4+ messages in thread From: KOSAKI Motohiro @ 2008-12-16 8:25 UTC (permalink / raw) To: Andrew Morton; +Cc: kosaki.motohiro, Yinghai Lu, Ingo Molnar, LKML > This would be better, no? Agreed. sorry sending silly patch. > --- a/fs/proc/stat.c~proc-enclose-desc-variable-of-show_stat-in-config_sparse_irq > +++ a/fs/proc/stat.c > @@ -28,7 +28,6 @@ static int show_stat(struct seq_file *p, > u64 sum_softirq = 0; > struct timespec boottime; > unsigned int per_irq_sum; > - struct irq_desc *desc; > > user = nice = system = idle = iowait = > irq = softirq = steal = cputime64_zero; > @@ -48,8 +47,7 @@ static int show_stat(struct seq_file *p, > 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); > @@ -103,8 +101,7 @@ static int show_stat(struct seq_file *p, > 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; > } > _ > ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [mmotm][PATCH] proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ 2008-12-16 8:25 ` KOSAKI Motohiro @ 2008-12-16 10:25 ` Ingo Molnar 0 siblings, 0 replies; 4+ messages in thread From: Ingo Molnar @ 2008-12-16 10:25 UTC (permalink / raw) To: KOSAKI Motohiro; +Cc: Andrew Morton, Yinghai Lu, LKML * KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> wrote: > > This would be better, no? > > Agreed. sorry sending silly patch. it wasnt silly - i've applied Andrew's tweaked variant of your fix to tip/irq/sparseirq, thanks guys! Ingo ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-12-16 10:25 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-12-16 8:00 [mmotm][PATCH] proc: enclose desc variable of show_stat() in CONFIG_SPARSE_IRQ KOSAKI Motohiro 2008-12-16 8:22 ` Andrew Morton 2008-12-16 8:25 ` KOSAKI Motohiro 2008-12-16 10:25 ` Ingo Molnar
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.