lkml.org 
[lkml]   [2013]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 06/19] sched/debug: fix format string for 32 bit platforms
On Fri, Jan 25, 2013 at 6:14 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> The type returned from atomic64_t can be either unsigned
> long or unsigned long long, depending on the architecture.
> Using a cast to unsigned long long lets us use the same
> format string for all architectures.
>
> Without this patch, building with scheduler debugging
> enabled results in:
>
> kernel/sched/debug.c: In function 'print_cfs_rq':
> kernel/sched/debug.c:225:2: warning: format '%ld' expects argument of type 'long int', but argument 4 has type 'long long int' [-Wformat]
> kernel/sched/debug.c:225:2: warning: format '%ld' expects argument of type 'long int', but argument 3 has type 'long long int' [-Wformat]
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Paul Turner <pjt@google.com>
> ---
> kernel/sched/debug.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
> index 2cd3c1b..7ae4c4c 100644
> --- a/kernel/sched/debug.c
> +++ b/kernel/sched/debug.c
> @@ -222,8 +222,8 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
> cfs_rq->runnable_load_avg);
> SEQ_printf(m, " .%-30s: %lld\n", "blocked_load_avg",
> cfs_rq->blocked_load_avg);
> - SEQ_printf(m, " .%-30s: %ld\n", "tg_load_avg",
> - atomic64_read(&cfs_rq->tg->load_avg));
> + SEQ_printf(m, " .%-30s: %lld\n", "tg_load_avg",
> + (unsigned long long)atomic64_read(&cfs_rq->tg->load_avg));
> SEQ_printf(m, " .%-30s: %lld\n", "tg_load_contrib",
> cfs_rq->tg_load_contrib);
> SEQ_printf(m, " .%-30s: %d\n", "tg_runnable_contrib",
> --
> 1.8.0
>

Looks good.

Reviewed-by: Paul Turner <pjt@google.com>


\
 
 \ /
  Last update: 2013-01-25 20:23    [W:0.418 / U:0.180 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site