diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-07-13 11:35:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-07-13 11:35:48 +0200 |
| commit | fc5d7e5bf4180eaaa4202659c2c9c3010d7490b6 (patch) | |
| tree | 865b5968566112478dc9364933c73fea692ac4fa | |
| parent | 6a8a75f3235724c5941a33e287b2f98966ad14c5 (diff) | |
| parent | 4b1303d0b01440f224cf81493b7e8e43d9b4965e (diff) | |
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 <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| -rw-r--r-- | tools/perf/util/machine.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 5de2b86b9880..2e9eb6aa3ce2 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -2209,7 +2209,7 @@ int machine__get_kernel_start(struct machine *machine) machine->kernel_start = 1ULL << 63; if (map) { err = map__load(map); - if (map->start) + if (!err) machine->kernel_start = map->start; } return err; |