lkml.org 
[lkml]   [2012]   [Mar]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/urgent] perf tools: Fix various casting issues for 32 bits
    Commit-ID:  9fafd98f1bf14276f95b69f0186ad5675f1e1a18
    Gitweb: http://git.kernel.org/tip/9fafd98f1bf14276f95b69f0186ad5675f1e1a18
    Author: Jiri Olsa <jolsa@redhat.com>
    AuthorDate: Tue, 20 Mar 2012 19:15:39 +0100
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Thu, 22 Mar 2012 15:11:18 -0300

    perf tools: Fix various casting issues for 32 bits

    - util/parse-events.c(parse_events_add_breakpoint)
    need to use unsigned long instead of u64, otherwise
    we get following gcc error on 32 bits:
    error: cast from pointer to integer of different size

    - util/header.c(print_event_desc)
    cannot retype to signed type, otherwise we get following
    gcc error on 32 bits:
    error: comparison between signed and unsigned integer expressions

    Signed-off-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1332267341-26338-2-git-send-email-jolsa@redhat.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/header.c | 2 +-
    tools/perf/util/parse-events.c | 2 +-
    2 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
    index fcd9cf3..4c7c2d7 100644
    --- a/tools/perf/util/header.c
    +++ b/tools/perf/util/header.c
    @@ -1177,7 +1177,7 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
    goto error;

    msz = sizeof(attr);
    - if (sz < (ssize_t)msz)
    + if (sz < msz)
    msz = sz;

    for (i = 0 ; i < nre; i++) {
    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index 201b40f..f542a63 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -569,7 +569,7 @@ int parse_events_add_breakpoint(struct list_head *list, int *idx,
    char name[MAX_NAME_LEN];

    memset(&attr, 0, sizeof(attr));
    - attr.bp_addr = (u64) ptr;
    + attr.bp_addr = (unsigned long) ptr;

    if (parse_breakpoint_type(type, &attr))
    return -EINVAL;

    \
     
     \ /
      Last update: 2012-03-23 09:33    [W:0.022 / U:95.956 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site