diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-20 20:32:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-20 20:32:37 +0100 |
| commit | d9e24427f339e5c18419769d41697062811c5cd8 (patch) | |
| tree | 3c50f19561f60d4175d375ff8d39ec203a42eb8c /tools/perf/util/event.c | |
| parent | d87f69a16eb2cb96459117b06949a560679002e4 (diff) | |
| parent | 65c1e0452a3389f9b7b8c1b23305ed2922fafb2d (diff) | |
Merge branch 'perf/core' of git://github.com/acmel/linux into perf/core
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 97c479bcb0dc..b7c7f39a8f6d 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -814,13 +814,14 @@ int perf_event__preprocess_sample(const union perf_event *event, al->cpu = sample->cpu; if (al->map) { + struct dso *dso = al->map->dso; + if (symbol_conf.dso_list && - (!al->map || !al->map->dso || - !(strlist__has_entry(symbol_conf.dso_list, - al->map->dso->short_name) || - (al->map->dso->short_name != al->map->dso->long_name && - strlist__has_entry(symbol_conf.dso_list, - al->map->dso->long_name))))) + (!dso || !(strlist__has_entry(symbol_conf.dso_list, + dso->short_name) || + (dso->short_name != dso->long_name && + strlist__has_entry(symbol_conf.dso_list, + dso->long_name))))) goto out_filtered; al->sym = map__find_symbol(al->map, al->addr, filter); |