Skip to content

Commit f7a46e0

Browse files
committed
perf machine: Fixup kernel maps ends after adding extra maps
I just noticed it would add extra kernel maps after modules. I think it should fixup end address of the kernel maps after adding all maps first. Fixes: 876e80c ("perf tools: Fixup end address of modules") Reported-by: Arnaldo Carvalho de Melo <[email protected]> Tested-by: Arnaldo Carvalho de Melo <[email protected]> Reviewed-by: Ian Rogers <[email protected]> Link: https://lore.kernel.org/lkml/Z7TvZGjVix2asYWI@x1 Link: https://lore.kernel.org/lkml/[email protected] Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Namhyung Kim <[email protected]>
1 parent 25d9c03 commit f7a46e0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tools/perf/util/machine.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,8 +1462,6 @@ static int machine__create_modules(struct machine *machine)
14621462
if (modules__parse(modules, machine, machine__create_module))
14631463
return -1;
14641464

1465-
maps__fixup_end(machine__kernel_maps(machine));
1466-
14671465
if (!machine__set_modules_path(machine))
14681466
return 0;
14691467

@@ -1557,6 +1555,8 @@ int machine__create_kernel_maps(struct machine *machine)
15571555
}
15581556
}
15591557

1558+
maps__fixup_end(machine__kernel_maps(machine));
1559+
15601560
out_put:
15611561
dso__put(kernel);
15621562
return ret;

0 commit comments

Comments
 (0)