From: Ingo Molnar <mingo@kernel.org>
Date: Thu, 1 May 2014 06:24:39 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to resolve conflict
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=aeffe2abc894b585acbe0923c0d4f21b4c5c1035;p=linux-beck.git

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>
---

aeffe2abc894b585acbe0923c0d4f21b4c5c1035
diff --cc tools/perf/arch/x86/tests/dwarf-unwind.c
index c916656259f7,83bc2385e6d3..9f89f899ccc7
--- a/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);