mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
db1a8b97a0
To bring in the change made in this cset:4d6ffa27b8("x86/lib: Change .weak to SYM_FUNC_START_WEAK for arch/x86/lib/mem*_64.S")6dcc5627f6("x86/asm: Change all ENTRY+ENDPROC to SYM_FUNC_*") I needed to define SYM_FUNC_START_LOCAL() as SYM_L_GLOBAL as mem{cpy,set}_{orig,erms} are used by 'perf bench'. This silences these perf tools build warnings: 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: Adrian Hunter <adrian.hunter@intel.com> Cc: Borislav Petkov <bp@suse.de> Cc: Fangrui Song <maskray@google.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Jiri Slaby <jirislaby@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
20 lines
771 B
ArmAsm
20 lines
771 B
ArmAsm
/* SPDX-License-Identifier: GPL-2.0 */
|
|
|
|
/* Various wrappers to make the kernel .S file build in user-space: */
|
|
|
|
// memcpy_orig and memcpy_erms are being defined as SYM_L_LOCAL but we need it
|
|
#define SYM_FUNC_START_LOCAL(name) \
|
|
SYM_START(name, SYM_L_GLOBAL, SYM_A_ALIGN)
|
|
#define memcpy MEMCPY /* don't hide glibc's memcpy() */
|
|
#define altinstr_replacement text
|
|
#define globl p2align 4; .globl
|
|
#define _ASM_EXTABLE_FAULT(x, y)
|
|
#define _ASM_EXTABLE(x, y)
|
|
|
|
#include "../../arch/x86/lib/memcpy_64.S"
|
|
/*
|
|
* We need to provide note.GNU-stack section, saying that we want
|
|
* NOT executable stack. Otherwise the final linking will assume that
|
|
* the ELF stack should not be restricted at all and set it RWX.
|
|
*/
|
|
.section .note.GNU-stack,"",@progbits
|