lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subjectcommit 1cb41fe7e34a43a1d27dfdb6d65699786dd44c20 in stable (v3.3.3) breaks perf
    gcc correctly complains:

    util/hist.c: In function ‘__hists__add_entry’:
    util/hist.c:240:27: error: invalid type argument of ‘->’ (have ‘struct hist_entry’)
    util/hist.c:241:23: error: invalid type argument of ‘->’ (have ‘struct hist_entry’)

    for this new code:

    + if (he->ms.map != entry->ms.map) {
    + he->ms.map = entry->ms.map;
    + if (he->ms.map)
    + he->ms.map->referenced = true;
    + }

    because "entry" is a "struct hist_entry", not a pointer to a struct.

    In mainline, "entry" is a pointer to struct passed as argument to the function.
    So this is broken during backporting. But obviously not compile tested.
    Greg wrote on G+ that those who did not test 3.3.3-rc1 have no right to complain, but I'm complaining anyway. :P

    See trivial patch to fix this.
    -Z.T.

    P.S.
    I don't need credit for the patch so it's ok if my diff doesn't apply because of messed up whitespace.
    Just fix it.

    Signed-off-by: Zeev Tarantov <zeev.tarantov@gmail.com>

    diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
    index a47a6f1..1794b92 100644
    --- a/tools/perf/util/hist.c
    +++ b/tools/perf/util/hist.c
    @@ -237,8 +237,8 @@ struct hist_entry *__hists__add_entry(struct hists *hists,
    * mis-adjust symbol addresses when computing
    * the history counter to increment.
    */
    - if (he->ms.map != entry->ms.map) {
    - he->ms.map = entry->ms.map;
    + if (he->ms.map != entry.ms.map) {
    + he->ms.map = entry.ms.map;
    if (he->ms.map)
    he->ms.map->referenced = true;
    }
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2012-04-23 08:43    [W:0.021 / U:64.216 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site