lkml.org 
[lkml]   [2010]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] perf probe: Remove build error of builtin-probe.c
    Date
    I got this build error when building tip tree,

    | cc1: warnings being treated as errors
    | builtin-probe.c:123: error: ‘opt_show_lines’ defined but not used

    This error is caused by:
    | #ifndef NO_LIBDWARF
    | OPT_CALLBACK('L', "line", NULL,
    | "FUNC[:RLN[+NUM|:RLN2]]|SRC:ALN[+NUM|:ALN2]",
    | "Show source code lines.", opt_show_lines),
    | #endif

    My environment defines NO_LIBDWARF, so gcc treated opt_show_lines() as garbage.
    So I moved opt_show_lines() into #ifndef NO_LIBDWARF ... #endif block.

    Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Masami Hiramatsu <mhiramat@redhat.com>
    ---
    tools/perf/builtin-probe.c | 19 ++++++++++---------
    1 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
    index 1d3a99e..34f2acb 100644
    --- a/tools/perf/builtin-probe.c
    +++ b/tools/perf/builtin-probe.c
    @@ -118,15 +118,6 @@ static int opt_del_probe_event(const struct option *opt __used,
    return 0;
    }

    -static int opt_show_lines(const struct option *opt __used,
    - const char *str, int unset __used)
    -{
    - if (str)
    - parse_line_range_desc(str, &session.line_range);
    - INIT_LIST_HEAD(&session.line_range.line_list);
    - session.show_lines = true;
    - return 0;
    -}
    /* Currently just checking function name from symbol map */
    static void evaluate_probe_point(struct probe_point *pp)
    {
    @@ -148,6 +139,16 @@ static int open_vmlinux(void)
    pr_debug("Try to open %s\n", session.kmap->dso->long_name);
    return open(session.kmap->dso->long_name, O_RDONLY);
    }
    +
    +static int opt_show_lines(const struct option *opt __used,
    + const char *str, int unset __used)
    +{
    + if (str)
    + parse_line_range_desc(str, &session.line_range);
    + INIT_LIST_HEAD(&session.line_range.line_list);
    + session.show_lines = true;
    + return 0;
    +}
    #endif

    static const char * const probe_usage[] = {
    --
    1.6.5.2
    --
    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: 2010-01-16 13:33    [W:0.024 / U:0.088 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site