From: Arnaldo Carvalho de Melo Date: Mon, 6 Feb 2012 21:10:52 +0000 (-0200) Subject: Merge branch 'perf/urgent' into perf/core X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5ddf146f70a44ed4133dea4d377b172605a1cfa5;p=linux-beck.git 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 --- 5ddf146f70a44ed4133dea4d377b172605a1cfa5 diff --cc tools/perf/bench/mem-memcpy-x86-64-asm.S index a20780bd0771,185a96d66dd1..fcd9cf00600a --- a/tools/perf/bench/mem-memcpy-x86-64-asm.S +++ b/tools/perf/bench/mem-memcpy-x86-64-asm.S @@@ -1,6 -1,8 +1,12 @@@ - +#define memcpy MEMCPY /* don't hide glibc's memcpy() */ +#define altinstr_replacement text +#define globl p2align 4; .globl +#define Lmemcpy_c globl memcpy_c; memcpy_c +#define Lmemcpy_c_e globl memcpy_c_e; memcpy_c_e #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