|
@@ -110,7 +110,6 @@ int test__vmlinux_matches_kallsyms(int subtest __maybe_unused)
|
|
|
*/
|
|
|
for (nd = rb_first(&vmlinux_map->dso->symbols[type]); nd; nd = rb_next(nd)) {
|
|
|
struct symbol *pair, *first_pair;
|
|
|
- bool backwards = true;
|
|
|
|
|
|
sym = rb_entry(nd, struct symbol, rb_node);
|
|
|
|
|
@@ -151,27 +150,14 @@ next_pair:
|
|
|
continue;
|
|
|
|
|
|
} else {
|
|
|
- struct rb_node *nnd;
|
|
|
-detour:
|
|
|
- nnd = backwards ? rb_prev(&pair->rb_node) :
|
|
|
- rb_next(&pair->rb_node);
|
|
|
- if (nnd) {
|
|
|
- struct symbol *next = rb_entry(nnd, struct symbol, rb_node);
|
|
|
-
|
|
|
- if (UM(next->start) == mem_start) {
|
|
|
- pair = next;
|
|
|
+ pair = machine__find_kernel_symbol_by_name(&kallsyms, type, sym->name, NULL, NULL);
|
|
|
+ if (pair) {
|
|
|
+ if (UM(pair->start) == mem_start)
|
|
|
goto next_pair;
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
- if (backwards) {
|
|
|
- backwards = false;
|
|
|
- pair = first_pair;
|
|
|
- goto detour;
|
|
|
+ pr_debug("%#" PRIx64 ": diff name v: %s k: %s\n",
|
|
|
+ mem_start, sym->name, pair->name);
|
|
|
}
|
|
|
-
|
|
|
- pr_debug("%#" PRIx64 ": diff name v: %s k: %s\n",
|
|
|
- mem_start, sym->name, pair->name);
|
|
|
}
|
|
|
} else
|
|
|
pr_debug("%#" PRIx64 ": %s not on kallsyms\n",
|