summaryrefslogtreecommitdiffstats
path: root/tools/perf/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-05-01 08:24:39 +0200
committerIngo Molnar <mingo@kernel.org>2014-05-01 08:24:39 +0200
commitaeffe2abc894b585acbe0923c0d4f21b4c5c1035 (patch)
treead712872dba8b8b1aa159fdb0f6dc7cc0ab5f9c6 /tools/perf/arch
parent201131998fbf074b03679afedcc29948e63331ef (diff)
parent399f0c220a0ee97a5a9ea1a699a58fe2aacf2983 (diff)
downloadop-kernel-dev-aeffe2abc894b585acbe0923c0d4f21b4c5c1035.zip
op-kernel-dev-aeffe2abc894b585acbe0923c0d4f21b4c5c1035.tar.gz
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>
Diffstat (limited to 'tools/perf/arch')
-rw-r--r--tools/perf/arch/x86/tests/dwarf-unwind.c2
-rw-r--r--tools/perf/arch/x86/tests/regs_load.S8
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/perf/arch/x86/tests/dwarf-unwind.c b/tools/perf/arch/x86/tests/dwarf-unwind.c
index c916656..9f89f89 100644
--- a/tools/perf/arch/x86/tests/dwarf-unwind.c
+++ b/tools/perf/arch/x86/tests/dwarf-unwind.c
@@ -23,7 +23,7 @@ static int sample_ustack(struct perf_sample *sample,
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);
if (!map) {
pr_debug("failed to get stack map\n");
free(buf);
diff --git a/tools/perf/arch/x86/tests/regs_load.S b/tools/perf/arch/x86/tests/regs_load.S
index 99167bf..60875d5 100644
--- a/tools/perf/arch/x86/tests/regs_load.S
+++ b/tools/perf/arch/x86/tests/regs_load.S
@@ -1,4 +1,3 @@
-
#include <linux/linkage.h>
#define AX 0
@@ -90,3 +89,10 @@ ENTRY(perf_regs_load)
ret
ENDPROC(perf_regs_load)
#endif
+
+/*
+ * We need to provide note.GNU-stack section, saying that we want
+ * NOT executable stack. Otherwise the final linking will assume that
+ * the ELF stack should not be restricted at all and set it RWX.
+ */
+.section .note.GNU-stack,"",@progbits
OpenPOWER on IntegriCloud