diff --git a/[refs] b/[refs] index 12861b59fa86..30d1de0393ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d37aa34f8806bb443dd3c8621fd9bdbb50c58bb +refs/heads/master: 9ea811973d49a1df0be04ff6e4df449e4fca4fb5 diff --git a/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S b/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S index a57b66e853c2..384b60788ab9 100644 --- a/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S +++ b/trunk/tools/perf/bench/mem-memcpy-x86-64-asm.S @@ -1,2 +1,2 @@ - +#define memcpy MEMCPY /* don't hide glibc's memcpy() */ #include "../../../arch/x86/lib/memcpy_64.S"