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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 12 Feb 2019 18:47:12 +0000 (19:47 +0100)
[ Upstream commit 866053bb644f754d1a93aaa9db9998fecf7a8978 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/perf/util/s390-cpumsf.c

index d2c78ff..aa7f8c1 100644 (file)
@@ -499,7 +499,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;
        }