lkml.org 
[lkml]   [2016]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.2.y-ckt 148/211] perf annotate: Fix 'annotate.use_offset' config variable usage
    Date
    4.2.8-ckt1 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Namhyung Kim <namhyung@kernel.org>

    commit 39ff7cdb5a5e6b75dd049255615828c6531cd109 upstream.

    The annotate__configs should be sorted so that it can use bsearch(3).

    However commit 0c4a5bcea460 ("perf annotate: Display total number of
    samples with --show-total-period") added a new config item at the end.
    This resulted in the 'annotate.use_offset' config variable cannot be
    found and perf terminated like below:

    $ perf report
    bad config file line 6 in ~/.perfconfig

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Martin Liška <mliska@suse.cz>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Taeung Song <treeze.taeung@gmail.com>
    Fixes: 0c4a5bcea460 ("perf annotate: Display total number of samples with --show-total-period")
    Link: http://lkml.kernel.org/r/1445396240-3428-1-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    tools/perf/ui/browsers/annotate.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
    index 5995a8b..ebca255 100644
    --- a/tools/perf/ui/browsers/annotate.c
    +++ b/tools/perf/ui/browsers/annotate.c
    @@ -1030,8 +1030,8 @@ static struct annotate_config {
    ANNOTATE_CFG(jump_arrows),
    ANNOTATE_CFG(show_linenr),
    ANNOTATE_CFG(show_nr_jumps),
    - ANNOTATE_CFG(use_offset),
    ANNOTATE_CFG(show_total_period),
    + ANNOTATE_CFG(use_offset),
    };

    #undef ANNOTATE_CFG
    --
    1.9.1


    \
     
     \ /
      Last update: 2016-01-05 22:01    [W:4.169 / U:0.844 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site