diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-06-02 09:13:12 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-06-02 09:13:12 +0200 |
commit | da3fd1a0010ccc9fe6fd5ae2b9e85e1aacc03e4d (patch) | |
tree | 84ee4a69289d06802ebc2ba0e4e69a53c91db72a /tools/perf/util/hist.c | |
parent | perf-record: Check correct pid when forking (diff) | |
parent | perf buildid-list: Fix --with-hits event processing (diff) | |
download | linux-da3fd1a0010ccc9fe6fd5ae2b9e85e1aacc03e4d.tar.xz linux-da3fd1a0010ccc9fe6fd5ae2b9e85e1aacc03e4d.zip |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
Diffstat (limited to 'tools/perf/util/hist.c')
-rw-r--r-- | tools/perf/util/hist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index cbf7eae2ce09..07f89b66b318 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -965,7 +965,7 @@ static int hist_entry__parse_objdump_line(struct hist_entry *self, FILE *file, * Parse hexa addresses followed by ':' */ line_ip = strtoull(tmp, &tmp2, 16); - if (*tmp2 != ':') + if (*tmp2 != ':' || tmp == tmp2) line_ip = -1; } |