Commit e3c2c4fb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-4.12-20170626' of...

Merge tag 'perf-urgent-for-mingo-4.12-20170626' of git://

 into perf/urgent

Pull perf/urgent fix from Arnaldo Carvalho de Melo:

 - Fix segfault for kernel.kptr_restrict=2 (Jiri Olsa)
Signed-off-by: default avatarArnaldo Carvalho de Melo <>
Signed-off-by: default avatarIngo Molnar <>
parents c0bc126f 3f938ee2
......@@ -1209,10 +1209,12 @@ int machine__create_kernel_maps(struct machine *machine)
if (machine__get_running_kernel_start(machine, &name, &addr)) {
} else if (maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) {
return -1;
if (!machine__get_running_kernel_start(machine, &name, &addr)) {
if (name &&
maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) {
return -1;
return 0;
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