diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-02-20 22:57:35 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-02-20 22:57:35 -0800 |
| commit | 40de53fd002c6ba087a623722915e8006ed68a02 (patch) | |
| tree | ec733b0a05924f98855728cd24de2ea38e1223b8 /tools/arch/x86/lib/memset_64.S | |
| parent | 0cab687205986491302cd2e440ef1d253031c221 (diff) | |
| parent | f3e6b3ae9cfc128af11b665c6ef4022ba2683778 (diff) | |
Merge branch 'for-6.8/cxl-cper' into for-6.8/cxl
Pick up CXL CPER notification removal for v6.8-rc6, to return in a later
merge window.
Diffstat (limited to 'tools/arch/x86/lib/memset_64.S')
| -rw-r--r-- | tools/arch/x86/lib/memset_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/arch/x86/lib/memset_64.S b/tools/arch/x86/lib/memset_64.S index 7c59a704c458..0199d56cb479 100644 --- a/tools/arch/x86/lib/memset_64.S +++ b/tools/arch/x86/lib/memset_64.S @@ -1,10 +1,10 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* Copyright 2002 Andi Kleen, SuSE Labs */ +#include <linux/export.h> #include <linux/linkage.h> #include <asm/cpufeatures.h> #include <asm/alternative.h> -#include <asm/export.h> .section .noinstr.text, "ax" @@ -40,7 +40,7 @@ SYM_FUNC_START(__memset) SYM_FUNC_END(__memset) EXPORT_SYMBOL(__memset) -SYM_FUNC_ALIAS(memset, __memset) +SYM_FUNC_ALIAS_MEMFUNC(memset, __memset) EXPORT_SYMBOL(memset) SYM_FUNC_START_LOCAL(memset_orig) |