Skip to content

Commit 00c8fde

Browse files
committed
tools headers: Update the copy of x86's mem{cpy,set}_64.S used in 'perf bench'
Also add SYM_PIC_ALIAS() to tools/perf/util/include/linux/linkage.h. This is to get the changes from: 419cbaf ("x86/boot: Add a bunch of PIC aliases") 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 <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Ian Rogers <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/aEry7L3fibwIG5au@x1 Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent aa69783 commit 00c8fde

File tree

3 files changed

+6
-0
lines changed

3 files changed

+6
-0
lines changed

tools/arch/x86/lib/memcpy_64.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ SYM_FUNC_END(__memcpy)
4040
EXPORT_SYMBOL(__memcpy)
4141

4242
SYM_FUNC_ALIAS_MEMFUNC(memcpy, __memcpy)
43+
SYM_PIC_ALIAS(memcpy)
4344
EXPORT_SYMBOL(memcpy)
4445

4546
SYM_FUNC_START_LOCAL(memcpy_orig)

tools/arch/x86/lib/memset_64.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ SYM_FUNC_END(__memset)
4242
EXPORT_SYMBOL(__memset)
4343

4444
SYM_FUNC_ALIAS_MEMFUNC(memset, __memset)
45+
SYM_PIC_ALIAS(memset)
4546
EXPORT_SYMBOL(memset)
4647

4748
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
@@ -132,4 +132,8 @@
132132
SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)
133133
#endif
134134

135+
#ifndef SYM_PIC_ALIAS
136+
#define SYM_PIC_ALIAS(sym) SYM_ALIAS(__pi_ ## sym, sym, SYM_T_FUNC, SYM_L_GLOBAL)
137+
#endif
138+
135139
#endif /* PERF_LINUX_LINKAGE_H_ */

0 commit comments

Comments
 (0)