Skip to content

Commit eb25de2

Browse files
committed
tools arch: Update arch/x86/lib/memcpy_64.S copy used in 'perf bench mem memcpy'
To bring in the change made in this cset: e3a9e68 ("x86/entry: Fixup bad_iret vs noinstr") This doesn't cause any functional changes to tooling, just a rebuild. Addresses this perf build warning: Warning: Kernel ABI header at 'tools/arch/x86/lib/memcpy_64.S' differs from latest version at 'arch/x86/lib/memcpy_64.S' diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S Cc: Adrian Hunter <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 9434628 commit eb25de2

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tools/arch/x86/lib/memcpy_64.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#include <asm/alternative-asm.h>
99
#include <asm/export.h>
1010

11+
.pushsection .noinstr.text, "ax"
12+
1113
/*
1214
* We build a jump to memcpy_orig by default which gets NOPped out on
1315
* the majority of x86 CPUs which set REP_GOOD. In addition, CPUs which
@@ -184,6 +186,8 @@ SYM_FUNC_START(memcpy_orig)
184186
retq
185187
SYM_FUNC_END(memcpy_orig)
186188

189+
.popsection
190+
187191
#ifndef CONFIG_UML
188192

189193
MCSAFE_TEST_CTL

0 commit comments

Comments
 (0)