diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-10-05 18:12:46 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-10-05 18:12:46 -0400 |
commit | d23e354fe58aada6d1cdeeb7e8463b75d44bc687 (patch) | |
tree | 2dad3326be13b1ea36bee8ecfabc88d326bfa19e /tools/arch | |
parent | 72c6ff2583fba824dc38c0ce87b838631cdb8294 (diff) |
perf bench mem: Sync memcpy assembly sources with the kernel
Commit 9a6fb28a355d ("x86/mce: Improve memcpy_mcsafe()") renames
memcpy_mcsafe() to memcpy_mcsafe_unrolled(), making
tools/arch/x86/lib/memcpy_64.S drift from the its kernel counterpart,
triggering this warning in the perf build:
Warning: tools/arch/x86/lib/memcpy_64.S differs from kernel
Sync that copy to acknowledge that, no changes to 'perf bench' are
needed, as this function is not used there.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-xfwc1raw8obyrctxerwt1bbb@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/arch')
-rw-r--r-- | tools/arch/x86/lib/memcpy_64.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/arch/x86/lib/memcpy_64.S b/tools/arch/x86/lib/memcpy_64.S index 2ec0b0abbfaa..49e6ebac7e73 100644 --- a/tools/arch/x86/lib/memcpy_64.S +++ b/tools/arch/x86/lib/memcpy_64.S | |||
@@ -181,11 +181,11 @@ ENDPROC(memcpy_orig) | |||
181 | 181 | ||
182 | #ifndef CONFIG_UML | 182 | #ifndef CONFIG_UML |
183 | /* | 183 | /* |
184 | * memcpy_mcsafe - memory copy with machine check exception handling | 184 | * memcpy_mcsafe_unrolled - memory copy with machine check exception handling |
185 | * Note that we only catch machine checks when reading the source addresses. | 185 | * Note that we only catch machine checks when reading the source addresses. |
186 | * Writes to target are posted and don't generate machine checks. | 186 | * Writes to target are posted and don't generate machine checks. |
187 | */ | 187 | */ |
188 | ENTRY(memcpy_mcsafe) | 188 | ENTRY(memcpy_mcsafe_unrolled) |
189 | cmpl $8, %edx | 189 | cmpl $8, %edx |
190 | /* Less than 8 bytes? Go to byte copy loop */ | 190 | /* Less than 8 bytes? Go to byte copy loop */ |
191 | jb .L_no_whole_words | 191 | jb .L_no_whole_words |
@@ -273,7 +273,7 @@ ENTRY(memcpy_mcsafe) | |||
273 | .L_done_memcpy_trap: | 273 | .L_done_memcpy_trap: |
274 | xorq %rax, %rax | 274 | xorq %rax, %rax |
275 | ret | 275 | ret |
276 | ENDPROC(memcpy_mcsafe) | 276 | ENDPROC(memcpy_mcsafe_unrolled) |
277 | 277 | ||
278 | .section .fixup, "ax" | 278 | .section .fixup, "ax" |
279 | /* Return -EFAULT for any failure */ | 279 | /* Return -EFAULT for any failure */ |