diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-05-17 10:34:59 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2023-05-17 10:42:19 -0300 |
| commit | 7f02ce62a6cfc0feb164bb7eb36c6647c00b43c8 (patch) | |
| tree | 59bdbf9179e39dd1a2077d22df3b05cf4c924570 /tools/include/asm | |
| parent | 9bc83d6e3824f09cef73b01256962d950965ddc4 (diff) | |
| download | linux-7f02ce62a6cfc0feb164bb7eb36c6647c00b43c8.tar.gz linux-7f02ce62a6cfc0feb164bb7eb36c6647c00b43c8.tar.bz2 linux-7f02ce62a6cfc0feb164bb7eb36c6647c00b43c8.zip | |
tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'
This is to get the changes from:
68674f94ffc9dddc ("x86: don't use REP_GOOD or ERMS for small memory copies")
20f3337d350c4e1b ("x86: don't use REP_GOOD or ERMS for small memory clearing")
This also make the 'perf bench mem' files stop referring to the erms
versions that gone away with the above patches.
That addresses these perf tools 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
Warning: Kernel ABI header at 'tools/arch/x86/lib/memset_64.S' differs from latest version at 'arch/x86/lib/memset_64.S'
diff -u tools/arch/x86/lib/memset_64.S arch/x86/lib/memset_64.S
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/include/asm')
| -rw-r--r-- | tools/include/asm/alternative.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/include/asm/alternative.h b/tools/include/asm/alternative.h index b54bd860dff6..7ce02a223732 100644 --- a/tools/include/asm/alternative.h +++ b/tools/include/asm/alternative.h @@ -4,7 +4,6 @@ /* Just disable it so we can build arch/x86/lib/memcpy_64.S for perf bench: */ -#define altinstruction_entry # -#define ALTERNATIVE_2 # +#define ALTERNATIVE # #endif |