diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-06-02 03:13:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-06-02 03:13:12 -0400 |
| commit | da3fd1a0010ccc9fe6fd5ae2b9e85e1aacc03e4d (patch) | |
| tree | 84ee4a69289d06802ebc2ba0e4e69a53c91db72a /tools/perf/util/hist.c | |
| parent | 2fb750e825b5347de0390315f4284f13709a9856 (diff) | |
| parent | b5c874f14c5f57cc8654e9184694196c466147bb (diff) | |
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, | |||
| 965 | * Parse hexa addresses followed by ':' | 965 | * Parse hexa addresses followed by ':' |
| 966 | */ | 966 | */ |
| 967 | line_ip = strtoull(tmp, &tmp2, 16); | 967 | line_ip = strtoull(tmp, &tmp2, 16); |
| 968 | if (*tmp2 != ':') | 968 | if (*tmp2 != ':' || tmp == tmp2) |
| 969 | line_ip = -1; | 969 | line_ip = -1; |
| 970 | } | 970 | } |
| 971 | 971 | ||