Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'

This is to get the changes from:

94ea9c05219518ef ("x86/headers: Replace #include <asm/export.h> with #include <linux/export.h>")
10f4c9b9a33b7df0 ("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>

+8 -4
+2 -2
tools/arch/x86/lib/memcpy_64.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0-only */ 2 2 /* Copyright 2002 Andi Kleen */ 3 3 4 + #include <linux/export.h> 4 5 #include <linux/linkage.h> 5 6 #include <asm/errno.h> 6 7 #include <asm/cpufeatures.h> 7 8 #include <asm/alternative.h> 8 - #include <asm/export.h> 9 9 10 10 .section .noinstr.text, "ax" 11 11 ··· 39 39 SYM_FUNC_END(__memcpy) 40 40 EXPORT_SYMBOL(__memcpy) 41 41 42 - SYM_FUNC_ALIAS(memcpy, __memcpy) 42 + SYM_FUNC_ALIAS_MEMFUNC(memcpy, __memcpy) 43 43 EXPORT_SYMBOL(memcpy) 44 44 45 45 SYM_FUNC_START_LOCAL(memcpy_orig)
+2 -2
tools/arch/x86/lib/memset_64.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 2 /* Copyright 2002 Andi Kleen, SuSE Labs */ 3 3 4 + #include <linux/export.h> 4 5 #include <linux/linkage.h> 5 6 #include <asm/cpufeatures.h> 6 7 #include <asm/alternative.h> 7 - #include <asm/export.h> 8 8 9 9 .section .noinstr.text, "ax" 10 10 ··· 40 40 SYM_FUNC_END(__memset) 41 41 EXPORT_SYMBOL(__memset) 42 42 43 - SYM_FUNC_ALIAS(memset, __memset) 43 + SYM_FUNC_ALIAS_MEMFUNC(memset, __memset) 44 44 EXPORT_SYMBOL(memset) 45 45 46 46 SYM_FUNC_START_LOCAL(memset_orig)
+4
tools/perf/util/include/linux/linkage.h
··· 115 115 SYM_ALIAS(alias, name, SYM_T_FUNC, SYM_L_WEAK) 116 116 #endif 117 117 118 + #ifndef SYM_FUNC_ALIAS_MEMFUNC 119 + #define SYM_FUNC_ALIAS_MEMFUNC SYM_FUNC_ALIAS 120 + #endif 121 + 118 122 // In the kernel sources (include/linux/cfi_types.h), this has a different 119 123 // definition when CONFIG_CFI_CLANG is used, for tools/ just use the !clang 120 124 // definition: