]> git.baikalelectronics.ru Git - kernel.git/commitdiff
libperf: Fix 32-bit build for tests uint64_t printf
authorRob Herring <robh@kernel.org>
Tue, 1 Feb 2022 21:39:03 +0000 (15:39 -0600)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 16 Feb 2022 16:49:24 +0000 (13:49 -0300)
Commit 19330c0fc81669a8 ("libperf tests: Add test_stat_multiplexing test")
added printf's of 64-bit ints using %lu which doesn't work on 32-bit
builds:

  tests/test-evlist.c:529:29: error: format ‘%lu’ expects argument of type \
    ‘long unsigned int’, but argument 4 has type ‘uint64_t’ {aka ‘long long unsigned int’} [-Werror=format=]

Use PRIu64 instead which works on both 32-bit and 64-bit systems.

Fixes: 19330c0fc81669a8 ("libperf tests: Add test_stat_multiplexing test")
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Link: https://lore.kernel.org/r/20220201213903.699656-1-robh@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/lib/perf/tests/test-evlist.c

index b3479dfa9a1cf006573997d07c40264395f631b2..fa854c83b7e7b8dde61dfa0df428a2883a28c0ca 100644 (file)
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #define _GNU_SOURCE // needed for sched.h to get sched_[gs]etaffinity and CPU_(ZERO,SET)
+#include <inttypes.h>
 #include <sched.h>
 #include <stdio.h>
 #include <stdarg.h>
@@ -526,12 +527,12 @@ static int test_stat_multiplexing(void)
 
        min = counts[0].val;
        for (i = 0; i < EVENT_NUM; i++) {
-               __T_VERBOSE("Event %2d -- Raw count = %lu, run = %lu, enable = %lu\n",
+               __T_VERBOSE("Event %2d -- Raw count = %" PRIu64 ", run = %" PRIu64 ", enable = %" PRIu64 "\n",
                            i, counts[i].val, counts[i].run, counts[i].ena);
 
                perf_counts_values__scale(&counts[i], true, &scaled);
                if (scaled == 1) {
-                       __T_VERBOSE("\t Scaled count = %lu (%.2lf%%, %lu/%lu)\n",
+                       __T_VERBOSE("\t Scaled count = %" PRIu64 " (%.2lf%%, %" PRIu64 "/%" PRIu64 ")\n",
                                    counts[i].val,
                                    (double)counts[i].run / (double)counts[i].ena * 100.0,
                                    counts[i].run, counts[i].ena);