Skip to content

Commit fb24e30

Browse files
committed
tools arch: Update arch/x86/lib/mem{cpy,set}_64.S copies used in 'perf bench mem memcpy'
To bring in the change made in this cset: 5e21a3e ("x86/alternative: Merge include files") This just silences these perf tools build warnings, no change in the tools: 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 Cc: Borislav Petkov <bp@suse.de> Cc: Juergen Gross <jgross@suse.com> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 5a80ee4 commit fb24e30

3 files changed

Lines changed: 2 additions & 2 deletions

File tree

tools/arch/x86/lib/memcpy_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <linux/linkage.h>
55
#include <asm/errno.h>
66
#include <asm/cpufeatures.h>
7-
#include <asm/alternative-asm.h>
7+
#include <asm/alternative.h>
88
#include <asm/export.h>
99

1010
.pushsection .noinstr.text, "ax"

tools/arch/x86/lib/memset_64.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <linux/linkage.h>
55
#include <asm/cpufeatures.h>
6-
#include <asm/alternative-asm.h>
6+
#include <asm/alternative.h>
77
#include <asm/export.h>
88

99
/*

0 commit comments

Comments
 (0)