Skip to content

Commit 54c6052

Browse files
committed
perf machine: Fixup kernel maps ends after adding extra maps
JIRA: https://issues.redhat.com/browse/RHEL-77936 upstream ======== commit f7a46e0 Author: Namhyung Kim <[email protected]> Date: Fri Feb 28 18:17:31 2025 -0300 description =========== 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]> Signed-off-by: Michael Petlan <[email protected]>
1 parent 7f73070 commit 54c6052

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
@@ -1468,8 +1468,6 @@ static int machine__create_modules(struct machine *machine)
14681468
if (modules__parse(modules, machine, machine__create_module))
14691469
return -1;
14701470

1471-
maps__fixup_end(machine__kernel_maps(machine));
1472-
14731471
if (!machine__set_modules_path(machine))
14741472
return 0;
14751473

@@ -1563,6 +1561,8 @@ int machine__create_kernel_maps(struct machine *machine)
15631561
}
15641562
}
15651563

1564+
maps__fixup_end(machine__kernel_maps(machine));
1565+
15661566
out_put:
15671567
dso__put(kernel);
15681568
return ret;

0 commit comments

Comments
 (0)