projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.4.30' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
tools
/
perf
/
util
/
probe-event.c
diff --git
a/tools/perf/util/probe-event.c
b/tools/perf/util/probe-event.c
index b51a8bfb40f92cd861d0954ed84e71e15ee50784..03875f9154e7562c060e5935d30bc65d6ba0973b 100644
(file)
--- a/
tools/perf/util/probe-event.c
+++ b/
tools/perf/util/probe-event.c
@@
-1895,9
+1895,8
@@
static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
sym = map__find_symbol(map, addr, NULL);
} else {
if (tp->symbol && !addr) {
sym = map__find_symbol(map, addr, NULL);
} else {
if (tp->symbol && !addr) {
- ret = kernel_get_symbol_address_by_name(tp->symbol,
- &addr, true, false);
- if (ret < 0)
+ if (kernel_get_symbol_address_by_name(tp->symbol,
+ &addr, true, false) < 0)
goto out;
}
if (addr) {
goto out;
}
if (addr) {
@@
-1905,6
+1904,7
@@
static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
sym = __find_kernel_function(addr, &map);
}
}
sym = __find_kernel_function(addr, &map);
}
}
+
if (!sym)
goto out;
if (!sym)
goto out;