The following commit has been merged into the locking/core branch of tip: Commit-ID: f4abe9967c6fdb511ee567e129a014b60945ab93 Gitweb: https://git.kernel.org/tip/f4abe9967c6fdb511ee567e129a014b60945ab93 Author: Arnd Bergmann <arnd@xxxxxxxx> AuthorDate: Wed, 21 Apr 2021 15:50:38 +02:00 Committer: Peter Zijlstra <peterz@xxxxxxxxxxxxx> CommitterDate: Thu, 22 Apr 2021 14:36:03 +02:00 kcsan: Fix printk format string Printing a 'long' variable using the '%d' format string is wrong and causes a warning from gcc: kernel/kcsan/kcsan_test.c: In function 'nthreads_gen_params': include/linux/kern_levels.h:5:25: error: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Werror=format=] Use the appropriate format modifier. Fixes: f6a149140321 ("kcsan: Switch to KUNIT_CASE_PARAM for parameterized tests") Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Reviewed-by: Marco Elver <elver@xxxxxxxxxx> Acked-by: Paul E. McKenney <paulmck@xxxxxxxxxx> Link: https://lkml.kernel.org/r/20210421135059.3371701-1-arnd@xxxxxxxxxx --- kernel/kcsan/kcsan_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/kcsan/kcsan_test.c b/kernel/kcsan/kcsan_test.c index b71751f..8bcffbd 100644 --- a/kernel/kcsan/kcsan_test.c +++ b/kernel/kcsan/kcsan_test.c @@ -984,7 +984,7 @@ static const void *nthreads_gen_params(const void *prev, char *desc) const long min_required_cpus = 2 + min_unused_cpus; if (num_online_cpus() < min_required_cpus) { - pr_err_once("Too few online CPUs (%u < %d) for test\n", + pr_err_once("Too few online CPUs (%u < %ld) for test\n", num_online_cpus(), min_required_cpus); nthreads = 0; } else if (nthreads >= num_online_cpus() - min_unused_cpus) {
![]() |