aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/bench/mem-memcpy-x86-64-asm.S
diff options
context:
space:
mode:
authorDmitry Torokhov <[email protected]>2012-03-19 17:02:01 -0700
committerDmitry Torokhov <[email protected]>2012-03-19 17:02:01 -0700
commit10ce3cc919f50c2043b41ca968b43c26a3672600 (patch)
treeea409366a5208aced495bc0516a08b81fd43222e /tools/perf/bench/mem-memcpy-x86-64-asm.S
parent24e3e5ae1e4c2a3a32f5b1f96b4e3fd721806acd (diff)
parent5c6a7a62c130afef3d61c1dee153012231ff5cd9 (diff)
Merge branch 'next' into for-linus
Diffstat (limited to 'tools/perf/bench/mem-memcpy-x86-64-asm.S')
-rw-r--r--tools/perf/bench/mem-memcpy-x86-64-asm.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/bench/mem-memcpy-x86-64-asm.S b/tools/perf/bench/mem-memcpy-x86-64-asm.S
index a57b66e853c2..185a96d66dd1 100644
--- a/tools/perf/bench/mem-memcpy-x86-64-asm.S
+++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S
@@ -1,2 +1,8 @@
#include "../../../arch/x86/lib/memcpy_64.S"
+/*
+ * 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