Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 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 <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c0bc126f 3f938ee2

tools/perf/util/machine.c

+6 −4
Original line number Diff line number Diff line
@@ -1209,11 +1209,13 @@ int machine__create_kernel_maps(struct machine *machine) 
	 */

	map_groups__fixup_end(&machine->kmaps);



	if (machine__get_running_kernel_start(machine, &name, &addr)) {

	} else if (maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) {

	if (!machine__get_running_kernel_start(machine, &name, &addr)) {

		if (name &&

		    maps__set_kallsyms_ref_reloc_sym(machine->vmlinux_maps, name, addr)) {

			machine__destroy_kernel_maps(machine);

			return -1;

		}

	}



	return 0;

}