Skip to content

Commit fc5d7e5

Browse files
author
Ingo Molnar
committed
Merge tag 'perf-urgent-for-mingo-4.13-20170712' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/urgent fix from Arnaldo Carvalho de Melo: - Accept zero as the kernel base address, to resolve symbols on architectures that don't partition the virtual address space in kernel/user, S/390, is one of such architectures and was where this problem was noticed. (Arnaldo Carvalho de Melo) Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2 parents 6a8a75f + 4b1303d commit fc5d7e5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tools/perf/util/machine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2209,7 +2209,7 @@ int machine__get_kernel_start(struct machine *machine)
22092209
machine->kernel_start = 1ULL << 63;
22102210
if (map) {
22112211
err = map__load(map);
2212-
if (map->start)
2212+
if (!err)
22132213
machine->kernel_start = map->start;
22142214
}
22152215
return err;

0 commit comments

Comments
 (0)