* linux-next: build warnings after merge of the tip tree
@ 2011-01-31 4:27 Stephen Rothwell
2011-01-31 5:08 ` Jaswinder Singh
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2011-01-31 4:27 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: linux-next, linux-kernel, Venkatesh Pallipadi
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
Hi all,
After merging the tip tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings:
kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not used
kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but not used
Introduced by commit abb74cefa9c682fb38ba86c17ca3c86fed6cc464 ("sched:
Export ns irqtimes through /proc/stat").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: build warnings after merge of the tip tree
2011-01-31 4:27 linux-next: build warnings after merge of the tip tree Stephen Rothwell
@ 2011-01-31 5:08 ` Jaswinder Singh
2011-01-31 19:12 ` [PATCH] Fix linux-next warning from abb74cef Venkatesh Pallipadi
0 siblings, 1 reply; 6+ messages in thread
From: Jaswinder Singh @ 2011-01-31 5:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
linux-next, linux-kernel, Venkatesh Pallipadi
Hello,
On Mon, Jan 31, 2011 at 9:57 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> After merging the tip tree, today's linux-next build (powerpc
> ppc64_defconfig) produced these warnings:
>
> kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not used
> kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but not used
>
These functions should move inside ifndef CONFIG_VIRT_CPU_ACCOUNTING
Thanks,
--
Jaswinder Singh.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] Fix linux-next warning from abb74cef
2011-01-31 5:08 ` Jaswinder Singh
@ 2011-01-31 19:12 ` Venkatesh Pallipadi
2011-01-31 19:38 ` Randy Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Venkatesh Pallipadi @ 2011-01-31 19:12 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next,
linux-kernel, Stephen Rothwell, Jaswinder Singh,
Venkatesh Pallipadi
Yes. Patch below should fix the problem.
Fix below warning -
Introduced by commit abb74cefa9c682fb38ba86c17ca3c86fed6cc464 ("sched:
Export ns irqtimes through /proc/stat").
After merging the tip tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings:
kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not =
used
kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but no=
t used
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Venkatesh Pallipadi <venki@google.com>
---
kernel/sched.c | 64 ++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 477e1bc..9a552bd 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3654,6 +3654,36 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
__account_system_time(p, cputime, cputime_scaled, target_cputime64);
}
+/*
+ * Account for involuntary wait time.
+ * @steal: the cpu time spent in involuntary wait
+ */
+void account_steal_time(cputime_t cputime)
+{
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
+ cputime64_t cputime64 = cputime_to_cputime64(cputime);
+
+ cpustat->steal = cputime64_add(cpustat->steal, cputime64);
+}
+
+/*
+ * Account for idle time.
+ * @cputime: the cpu time spent in idle wait
+ */
+void account_idle_time(cputime_t cputime)
+{
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
+ cputime64_t cputime64 = cputime_to_cputime64(cputime);
+ struct rq *rq = this_rq();
+
+ if (atomic_read(&rq->nr_iowait) > 0)
+ cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
+ else
+ cpustat->idle = cputime64_add(cpustat->idle, cputime64);
+}
+
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
/*
* Account a tick to a process and cpustat
@@ -3715,41 +3745,11 @@ static void irqtime_account_idle_ticks(int ticks)
for (i = 0; i < ticks; i++)
irqtime_account_process_tick(current, 0, rq);
}
-#else
+#else /* CONFIG_IRQ_TIME_ACCOUNTING */
static void irqtime_account_idle_ticks(int ticks) {}
static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
struct rq *rq) {}
-#endif
-
-/*
- * Account for involuntary wait time.
- * @steal: the cpu time spent in involuntary wait
- */
-void account_steal_time(cputime_t cputime)
-{
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
- cputime64_t cputime64 = cputime_to_cputime64(cputime);
-
- cpustat->steal = cputime64_add(cpustat->steal, cputime64);
-}
-
-/*
- * Account for idle time.
- * @cputime: the cpu time spent in idle wait
- */
-void account_idle_time(cputime_t cputime)
-{
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
- cputime64_t cputime64 = cputime_to_cputime64(cputime);
- struct rq *rq = this_rq();
-
- if (atomic_read(&rq->nr_iowait) > 0)
- cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
- else
- cpustat->idle = cputime64_add(cpustat->idle, cputime64);
-}
-
-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
/*
* Account a single tick of cpu time.
--
1.7.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux-next warning from abb74cef
2011-01-31 19:12 ` [PATCH] Fix linux-next warning from abb74cef Venkatesh Pallipadi
@ 2011-01-31 19:38 ` Randy Dunlap
2011-01-31 20:16 ` Venkatesh Pallipadi
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2011-01-31 19:38 UTC (permalink / raw)
To: Venkatesh Pallipadi
Cc: Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next, linux-kernel, Stephen Rothwell, Jaswinder Singh
On Mon, 31 Jan 2011 11:12:43 -0800 Venkatesh Pallipadi wrote:
> Yes. Patch below should fix the problem.
>
> Fix below warning -
> Introduced by commit abb74cefa9c682fb38ba86c17ca3c86fed6cc464 ("sched:
> Export ns irqtimes through /proc/stat").
>
> After merging the tip tree, today's linux-next build (powerpc
> ppc64_defconfig) produced these warnings:
>
> kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not =
> used
> kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but no=
> t used
[ugh on the '=' line continuations.]
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Venkatesh Pallipadi <venki@google.com>
> ---
> kernel/sched.c | 64 ++++++++++++++++++++++++++++----------------------------
> 1 files changed, 32 insertions(+), 32 deletions(-)
>
> diff --git a/kernel/sched.c b/kernel/sched.c
> index 477e1bc..9a552bd 100644
> --- a/kernel/sched.c
> +++ b/kernel/sched.c
> @@ -3654,6 +3654,36 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
> __account_system_time(p, cputime, cputime_scaled, target_cputime64);
> }
>
> +/*
> + * Account for involuntary wait time.
> + * @steal: the cpu time spent in involuntary wait
I see that you only moved this code, but please change @steal to @cputime also.
> + */
> +void account_steal_time(cputime_t cputime)
> +{
> + struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
> + cputime64_t cputime64 = cputime_to_cputime64(cputime);
> +
> + cpustat->steal = cputime64_add(cpustat->steal, cputime64);
> +}
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux-next warning from abb74cef
2011-01-31 19:38 ` Randy Dunlap
@ 2011-01-31 20:16 ` Venkatesh Pallipadi
2011-01-31 20:25 ` Randy Dunlap
0 siblings, 1 reply; 6+ messages in thread
From: Venkatesh Pallipadi @ 2011-01-31 20:16 UTC (permalink / raw)
To: Peter Zijlstra
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, linux-next,
linux-kernel, Stephen Rothwell, Jaswinder Singh, Randy Dunlap,
Venkatesh Pallipadi
Thanks. Updated to address comments from Randy.
Yes. Patch below should fix the problem.
Fix below warning -
Introduced by commit abb74cefa9c682fb38ba86c17ca3c86fed6cc464 ("sched:
Export ns irqtimes through /proc/stat").
After merging the tip tree, today's linux-next build (powerpc
ppc64_defconfig) produced these warnings:
kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not used
kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but not used
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Venkatesh Pallipadi <venki@google.com>
---
kernel/sched.c | 64 ++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c
index 477e1bc..9a552bd 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -3654,6 +3654,36 @@ void account_system_time(struct task_struct *p, int hardirq_offset,
__account_system_time(p, cputime, cputime_scaled, target_cputime64);
}
+/*
+ * Account for involuntary wait time.
+ * @cputime: the cpu time spent in involuntary wait
+ */
+void account_steal_time(cputime_t cputime)
+{
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
+ cputime64_t cputime64 = cputime_to_cputime64(cputime);
+
+ cpustat->steal = cputime64_add(cpustat->steal, cputime64);
+}
+
+/*
+ * Account for idle time.
+ * @cputime: the cpu time spent in idle wait
+ */
+void account_idle_time(cputime_t cputime)
+{
+ struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
+ cputime64_t cputime64 = cputime_to_cputime64(cputime);
+ struct rq *rq = this_rq();
+
+ if (atomic_read(&rq->nr_iowait) > 0)
+ cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
+ else
+ cpustat->idle = cputime64_add(cpustat->idle, cputime64);
+}
+
+#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+
#ifdef CONFIG_IRQ_TIME_ACCOUNTING
/*
* Account a tick to a process and cpustat
@@ -3715,41 +3745,11 @@ static void irqtime_account_idle_ticks(int ticks)
for (i = 0; i < ticks; i++)
irqtime_account_process_tick(current, 0, rq);
}
-#else
+#else /* CONFIG_IRQ_TIME_ACCOUNTING */
static void irqtime_account_idle_ticks(int ticks) {}
static void irqtime_account_process_tick(struct task_struct *p, int user_tick,
struct rq *rq) {}
-#endif
-
-/*
- * Account for involuntary wait time.
- * @steal: the cpu time spent in involuntary wait
- */
-void account_steal_time(cputime_t cputime)
-{
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
- cputime64_t cputime64 = cputime_to_cputime64(cputime);
-
- cpustat->steal = cputime64_add(cpustat->steal, cputime64);
-}
-
-/*
- * Account for idle time.
- * @cputime: the cpu time spent in idle wait
- */
-void account_idle_time(cputime_t cputime)
-{
- struct cpu_usage_stat *cpustat = &kstat_this_cpu.cpustat;
- cputime64_t cputime64 = cputime_to_cputime64(cputime);
- struct rq *rq = this_rq();
-
- if (atomic_read(&rq->nr_iowait) > 0)
- cpustat->iowait = cputime64_add(cpustat->iowait, cputime64);
- else
- cpustat->idle = cputime64_add(cpustat->idle, cputime64);
-}
-
-#ifndef CONFIG_VIRT_CPU_ACCOUNTING
+#endif /* CONFIG_IRQ_TIME_ACCOUNTING */
/*
* Account a single tick of cpu time.
--
1.7.3.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] Fix linux-next warning from abb74cef
2011-01-31 20:16 ` Venkatesh Pallipadi
@ 2011-01-31 20:25 ` Randy Dunlap
0 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2011-01-31 20:25 UTC (permalink / raw)
To: Venkatesh Pallipadi
Cc: Peter Zijlstra, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
linux-next, linux-kernel, Stephen Rothwell, Jaswinder Singh,
Randy Dunlap
On Mon, 31 Jan 2011 12:16:46 -0800 Venkatesh Pallipadi wrote:
> Thanks. Updated to address comments from Randy.
>
> Yes. Patch below should fix the problem.
>
> Fix below warning -
> Introduced by commit abb74cefa9c682fb38ba86c17ca3c86fed6cc464 ("sched:
> Export ns irqtimes through /proc/stat").
Thanks, Venki.
Maybe next time we can even get a descriptive $subject. ;)
(I'm not requesting that you resend this patch.)
> After merging the tip tree, today's linux-next build (powerpc
> ppc64_defconfig) produced these warnings:
>
> kernel/sched.c:3719: warning: 'irqtime_account_idle_ticks' defined but not used
> kernel/sched.c:3720: warning: 'irqtime_account_process_tick' defined but not used
>
> Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Venkatesh Pallipadi <venki@google.com>
> ---
> kernel/sched.c | 64 ++++++++++++++++++++++++++++----------------------------
> 1 files changed, 32 insertions(+), 32 deletions(-)
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-31 20:27 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-31 4:27 linux-next: build warnings after merge of the tip tree Stephen Rothwell
2011-01-31 5:08 ` Jaswinder Singh
2011-01-31 19:12 ` [PATCH] Fix linux-next warning from abb74cef Venkatesh Pallipadi
2011-01-31 19:38 ` Randy Dunlap
2011-01-31 20:16 ` Venkatesh Pallipadi
2011-01-31 20:25 ` Randy Dunlap
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.