Merge branch 'perf/urgent' into perf/core, to resolve conflict

Conflicts:
	tools/perf/arch/x86/tests/dwarf-unwind.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc tools/perf/Makefile.perf
Simple merge

diff --cc tools/perf/arch/x86/tests/dwarf-unwind.c
index c916656259f7f11f7fe8974b16f0723672c15905,83bc2385e6d3c2820958b279f77c4d08342b1e06..9f89f899ccc75ff2091f140009e6a29486ae4d2a
--- 1/tools/perf/arch/x86/tests/dwarf-unwind.c
--- 2/tools/perf/arch/x86/tests/dwarf-unwind.c
+++ b/tools/perf/arch/x86/tests/dwarf-unwind.c
@@@ -23,7 -23,7 +23,7 @@@ static int sample_ustack(struct perf_sa
  
        sp = (unsigned long) regs[PERF_REG_X86_SP];
  
-       map = map_groups__find(thread->mg, MAP__FUNCTION, (u64) sp);
 -      map = map_groups__find(&thread->mg, MAP__VARIABLE, (u64) sp);
++      map = map_groups__find(thread->mg, MAP__VARIABLE, (u64) sp);
        if (!map) {
                pr_debug("failed to get stack map\n");
                free(buf);

diff --cc tools/perf/util/machine.c
Simple merge