Skip to content

Commit efe80f9

Browse files
committed
tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'
This is to get the changes from: 94ea9c0 ("x86/headers: Replace #include <asm/export.h> with #include <linux/export.h>") 10f4c9b ("x86/asm: Fix build of UML with KASAN") That addresses these perf tools build warning: Warning: Kernel ABI header differences: diff -u tools/arch/x86/lib/memcpy_64.S arch/x86/lib/memcpy_64.S diff -u tools/arch/x86/lib/memset_64.S arch/x86/lib/memset_64.S Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Masahiro Yamada <masahiroy@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Vincent Whitchurch <vincent.whitchurch@axis.com> Link: https://lore.kernel.org/lkml/ZbkIKpKdNqOFdMwJ@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 15d6daa commit efe80f9

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

tools/arch/x86/lib/memcpy_64.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/* SPDX-License-Identifier: GPL-2.0-only */
22
/* Copyright 2002 Andi Kleen */
33

4+
#include <linux/export.h>
45
#include <linux/linkage.h>
56
#include <asm/errno.h>
67
#include <asm/cpufeatures.h>
78
#include <asm/alternative.h>
8-
#include <asm/export.h>
99

1010
.section .noinstr.text, "ax"
1111

@@ -39,7 +39,7 @@ SYM_TYPED_FUNC_START(__memcpy)
3939
SYM_FUNC_END(__memcpy)
4040
EXPORT_SYMBOL(__memcpy)
4141

42-
SYM_FUNC_ALIAS(memcpy, __memcpy)
42+
SYM_FUNC_ALIAS_MEMFUNC(memcpy, __memcpy)
4343
EXPORT_SYMBOL(memcpy)
4444

4545
SYM_FUNC_START_LOCAL(memcpy_orig)

tools/arch/x86/lib/memset_64.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/* Copyright 2002 Andi Kleen, SuSE Labs */
33

4+
#include <linux/export.h>
45
#include <linux/linkage.h>
56
#include <asm/cpufeatures.h>
67
#include <asm/alternative.h>
7-
#include <asm/export.h>
88

99
.section .noinstr.text, "ax"
1010

@@ -40,7 +40,7 @@ SYM_FUNC_START(__memset)
4040
SYM_FUNC_END(__memset)
4141
EXPORT_SYMBOL(__memset)
4242

43-
SYM_FUNC_ALIAS(memset, __memset)
43+
SYM_FUNC_ALIAS_MEMFUNC(memset, __memset)
4444
EXPORT_SYMBOL(memset)
4545

4646
SYM_FUNC_START_LOCAL(memset_orig)

tools/perf/util/include/linux/linkage.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,10 @@
115115
SYM_ALIAS(alias, name, SYM_T_FUNC, SYM_L_WEAK)
116116
#endif
117117

118+
#ifndef SYM_FUNC_ALIAS_MEMFUNC
119+
#define SYM_FUNC_ALIAS_MEMFUNC SYM_FUNC_ALIAS
120+
#endif
121+
118122
// In the kernel sources (include/linux/cfi_types.h), this has a different
119123
// definition when CONFIG_CFI_CLANG is used, for tools/ just use the !clang
120124
// definition:

0 commit comments

Comments
 (0)