lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 202/352] perf tools: Cast off_t to s64 to avoid warning on bionic libc
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ 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 | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/util/s390-cpumsf.c b/tools/perf/util/s390-cpumsf.c
    index a2eeebbfb25f..68b2570304ec 100644
    --- a/tools/perf/util/s390-cpumsf.c
    +++ b/tools/perf/util/s390-cpumsf.c
    @@ -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;
    }
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 17:03    [W:2.187 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site