]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
perf tools: Cast off_t to s64 to avoid warning on bionic libc
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 11 Dec 2018 19:43:40 +0000 (16:43 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 18 Dec 2018 15:23:57 +0000 (12:23 -0300)
To avoid this warning:

    CC       /tmp/build/perf/util/s390-cpumsf.o
  util/s390-cpumsf.c: In function 's390_cpumsf_samples':
  util/s390-cpumsf.c:508:3: warning: format '%llx' expects argument of type 'long long unsigned int', but argument 4 has type 'off_t' [-Wformat=]
     pr_err("[%#08" PRIx64 "] Invalid AUX trailer entry TOD clock base\n",
     ^

Now the various Android cross toolchains used in the perf tools
container test builds are all clean and we can remove this:

  export EXTRA_MAKE_ARGS="WERROR=0"

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Link: https://lkml.kernel.org/n/tip-5rav4ccyb0sjciysz2i4p3sx@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/s390-cpumsf.c

index a2eeebbfb25f5f113a7eb867b3ee51e46d83b67a..68b2570304eceb5499b471d1a5f350aaac115800 100644 (file)
@@ -506,7 +506,7 @@ static int s390_cpumsf_samples(struct s390_cpumsf_queue *sfq, u64 *ts)
        aux_ts = get_trailer_time(buf);
        if (!aux_ts) {
                pr_err("[%#08" PRIx64 "] Invalid AUX trailer entry TOD clock base\n",
-                      sfq->buffer->data_offset);
+                      (s64)sfq->buffer->data_offset);
                aux_ts = ~0ULL;
                goto out;
        }