Commit fc5d7e5b authored by Ingo Molnar's avatar Ingo Molnar

Merge tag 'perf-urgent-for-mingo-4.13-20170712' of...

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 6a8a75f3 4b1303d0
...@@ -2209,7 +2209,7 @@ int machine__get_kernel_start(struct machine *machine) ...@@ -2209,7 +2209,7 @@ int machine__get_kernel_start(struct machine *machine)
machine->kernel_start = 1ULL << 63; machine->kernel_start = 1ULL << 63;
if (map) { if (map) {
err = map__load(map); err = map__load(map);
if (map->start) if (!err)
machine->kernel_start = map->start; machine->kernel_start = map->start;
} }
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment