[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-0eda7385db1f30271ade830a231006938a76fb53@git.kernel.org>
Date: Sun, 17 Jan 2010 06:59:09 GMT
From: tip-bot for Hitoshi Mitake <mitake@....info.waseda.ac.jp>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, paulus@...ba.org, hpa@...or.com,
mingo@...hat.com, a.p.zijlstra@...llo.nl, efault@....de,
mitake@....info.waseda.ac.jp, fweisbec@...il.com,
tglx@...utronix.de, mhiramat@...hat.com, mingo@...e.hu
Subject: [tip:perf/core] perf probe: Fix build error of builtin-probe.c
Commit-ID: 0eda7385db1f30271ade830a231006938a76fb53
Gitweb: http://git.kernel.org/tip/0eda7385db1f30271ade830a231006938a76fb53
Author: Hitoshi Mitake <mitake@....info.waseda.ac.jp>
AuthorDate: Sat, 16 Jan 2010 21:31:16 +0900
Committer: Ingo Molnar <mingo@...e.hu>
CommitDate: Sun, 17 Jan 2010 07:55:19 +0100
perf probe: Fix build error of builtin-probe.c
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@....info.waseda.ac.jp>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: Masami Hiramatsu <mhiramat@...hat.com>
Cc: Mike Galbraith <efault@....de>
LKML-Reference: <1263645076-9993-1-git-send-email-mitake@....info.waseda.ac.jp>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
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[] = {
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists