|
@@ -1511,12 +1511,10 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map,
|
|
symbol_filter_t filter)
|
|
symbol_filter_t filter)
|
|
{
|
|
{
|
|
int i, err = 0;
|
|
int i, err = 0;
|
|
- char *filename;
|
|
|
|
|
|
+ char *filename = NULL;
|
|
|
|
|
|
- pr_debug("Looking at the vmlinux_path (%d entries long)\n",
|
|
|
|
- vmlinux_path__nr_entries + 1);
|
|
|
|
-
|
|
|
|
- filename = dso__build_id_filename(dso, NULL, 0);
|
|
|
|
|
|
+ if (!symbol_conf.ignore_vmlinux_buildid)
|
|
|
|
+ filename = dso__build_id_filename(dso, NULL, 0);
|
|
if (filename != NULL) {
|
|
if (filename != NULL) {
|
|
err = dso__load_vmlinux(dso, map, filename, true, filter);
|
|
err = dso__load_vmlinux(dso, map, filename, true, filter);
|
|
if (err > 0)
|
|
if (err > 0)
|
|
@@ -1524,6 +1522,9 @@ int dso__load_vmlinux_path(struct dso *dso, struct map *map,
|
|
free(filename);
|
|
free(filename);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ pr_debug("Looking at the vmlinux_path (%d entries long)\n",
|
|
|
|
+ vmlinux_path__nr_entries + 1);
|
|
|
|
+
|
|
for (i = 0; i < vmlinux_path__nr_entries; ++i) {
|
|
for (i = 0; i < vmlinux_path__nr_entries; ++i) {
|
|
err = dso__load_vmlinux(dso, map, vmlinux_path[i], false, filter);
|
|
err = dso__load_vmlinux(dso, map, vmlinux_path[i], false, filter);
|
|
if (err > 0)
|
|
if (err > 0)
|