Commit 00c8fde7 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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:

  419cbaf6 ("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 <adrian.hunter@intel.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/aEry7L3fibwIG5au@x1


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent aa69783a

tools/arch/x86/lib/memcpy_64.S

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ SYM_FUNC_END(__memcpy) 
EXPORT_SYMBOL(__memcpy)



SYM_FUNC_ALIAS_MEMFUNC(memcpy, __memcpy)

SYM_PIC_ALIAS(memcpy)

EXPORT_SYMBOL(memcpy)



SYM_FUNC_START_LOCAL(memcpy_orig)

tools/arch/x86/lib/memset_64.S

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ SYM_FUNC_END(__memset) 
EXPORT_SYMBOL(__memset)



SYM_FUNC_ALIAS_MEMFUNC(memset, __memset)

SYM_PIC_ALIAS(memset)

EXPORT_SYMBOL(memset)



SYM_FUNC_START_LOCAL(memset_orig)

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

+4 −0
Original line number Diff line number Diff line
@@ -132,4 +132,8 @@ 
        SYM_TYPED_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)

#endif



#ifndef SYM_PIC_ALIAS

#define SYM_PIC_ALIAS(sym)	SYM_ALIAS(__pi_ ## sym, sym, SYM_T_FUNC, SYM_L_GLOBAL)

#endif



#endif	/* PERF_LINUX_LINKAGE_H_ */