Commit cff3c124 authored Jan 25, 2013 by Arnd Bergmann Committed by Ingo Molnar Jan 25, 2013

sched/debug: Fix format string for 32-bit platforms



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: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Turner <pjt@google.com>
Cc: linux-arm-kernel@list.infradead.org
Link: http://lkml.kernel.org/r/1359123276-15833-7-git-send-email-arnd@arndb.de


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 38dc3348

kernel/sched/debug.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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",

Admin message