diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-06 16:10:52 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-02-06 16:11:02 -0500 |
| commit | 5ddf146f70a44ed4133dea4d377b172605a1cfa5 (patch) | |
| tree | 058b6f58b5ab756f9fe798983e7c7bbf75450509 /tools/perf/bench | |
| parent | 781ba9d2ed9df07dbb413fb5ee80ef7d353841c9 (diff) | |
| parent | a4a03fc7ef89020baca4f19174e6a43767c6d78a (diff) | |
Merge branch 'perf/urgent' into perf/core
So that we can get the perf bench exec stack fixes and then apply the
remaining fix for the files added after what is in perf/urgent.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/bench')
| -rw-r--r-- | tools/perf/bench/mem-memcpy-x86-64-asm.S | 6 |
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 a20780bd0771..fcd9cf00600a 100644 --- a/tools/perf/bench/mem-memcpy-x86-64-asm.S +++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S | |||
| @@ -4,3 +4,9 @@ | |||
| 4 | #define Lmemcpy_c globl memcpy_c; memcpy_c | 4 | #define Lmemcpy_c globl memcpy_c; memcpy_c |
| 5 | #define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e | 5 | #define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e |
| 6 | #include "../../../arch/x86/lib/memcpy_64.S" | 6 | #include "../../../arch/x86/lib/memcpy_64.S" |
| 7 | /* | ||
| 8 | * We need to provide note.GNU-stack section, saying that we want | ||
| 9 | * NOT executable stack. Otherwise the final linking will assume that | ||
| 10 | * the ELF stack should not be restricted at all and set it RWX. | ||
| 11 | */ | ||
| 12 | .section .note.GNU-stack,"",@progbits | ||