diff options
| author | Will Deacon <will@kernel.org> | 2022-03-14 19:01:05 +0000 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2022-03-14 19:01:05 +0000 |
| commit | 563c463595307a3dd1ae80c462af69d94b1e80bf (patch) | |
| tree | 980be428322746c8e53cd6e01925ea08f0f6948a /arch/arm64/lib/strnlen.S | |
| parent | 839d0758927fb62958b79dffd385a7dc0ac522bc (diff) | |
| parent | 4013e26670c590944abdab56c4fa797527b74325 (diff) | |
Merge branch 'for-next/linkage' into for-next/core
* for-next/linkage:
arm64: module: remove (NOLOAD) from linker script
linkage: remove SYM_FUNC_{START,END}_ALIAS()
x86: clean up symbol aliasing
arm64: clean up symbol aliasing
linkage: add SYM_FUNC_ALIAS{,_LOCAL,_WEAK}()
Diffstat (limited to 'arch/arm64/lib/strnlen.S')
| -rw-r--r-- | arch/arm64/lib/strnlen.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm64/lib/strnlen.S b/arch/arm64/lib/strnlen.S index b72913a99038..d5ac0e10a01d 100644 --- a/arch/arm64/lib/strnlen.S +++ b/arch/arm64/lib/strnlen.S @@ -47,7 +47,7 @@ limit_wd .req x14 #define REP8_7f 0x7f7f7f7f7f7f7f7f #define REP8_80 0x8080808080808080 -SYM_FUNC_START_WEAK_PI(strnlen) +SYM_FUNC_START(__pi_strnlen) cbz limit, .Lhit_limit mov zeroones, #REP8_01 bic src, srcin, #15 @@ -156,5 +156,7 @@ CPU_LE( lsr tmp2, tmp2, tmp4 ) /* Shift (tmp1 & 63). */ .Lhit_limit: mov len, limit ret -SYM_FUNC_END_PI(strnlen) +SYM_FUNC_END(__pi_strnlen) + +SYM_FUNC_ALIAS_WEAK(strnlen, __pi_strnlen) EXPORT_SYMBOL_NOKASAN(strnlen) |