diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-28 08:06:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-28 08:06:57 +0200 |
| commit | 6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch) | |
| tree | d54e7fa59df16bb62902129dfd28956d9ae1be19 /tools/perf/util/probe-event.c | |
| parent | 968d712a2565121b269e1037a1517916a9769423 (diff) | |
| parent | 097f70b3c4d84ffccca15195bdfde3a37c0a7c0f (diff) | |
| download | op-kernel-dev-6afc0c269c3d20cde05515b00ede00e91fee0be5.zip op-kernel-dev-6afc0c269c3d20cde05515b00ede00e91fee0be5.tar.gz | |
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/probe-event.c')
| -rw-r--r-- | tools/perf/util/probe-event.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 2b78e8f..7fb0533 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -269,12 +269,13 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso) int ret = 0; if (module) { - list_for_each_entry(dso, &host_machine->dsos.head, node) { - if (!dso->kernel) - continue; - if (strncmp(dso->short_name + 1, module, - dso->short_name_len - 2) == 0) - goto found; + char module_name[128]; + + snprintf(module_name, sizeof(module_name), "[%s]", module); + map = map_groups__find_by_name(&host_machine->kmaps, MAP__FUNCTION, module_name); + if (map) { + dso = map->dso; + goto found; } pr_debug("Failed to find module %s.\n", module); return -ENOENT; |
