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/strlen.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/strlen.S')
| -rw-r--r-- | arch/arm64/lib/strlen.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/lib/strlen.S b/arch/arm64/lib/strlen.S index 1648790e91b3..4919fe81ae54 100644 --- a/arch/arm64/lib/strlen.S +++ b/arch/arm64/lib/strlen.S @@ -79,7 +79,7 @@ whether the first fetch, which may be misaligned, crosses a page boundary. */ -SYM_FUNC_START_WEAK_PI(strlen) +SYM_FUNC_START(__pi_strlen) and tmp1, srcin, MIN_PAGE_SIZE - 1 mov zeroones, REP8_01 cmp tmp1, MIN_PAGE_SIZE - 16 @@ -208,6 +208,6 @@ L(page_cross): csel data1, data1, tmp4, eq csel data2, data2, tmp2, eq b L(page_cross_entry) - -SYM_FUNC_END_PI(strlen) +SYM_FUNC_END(__pi_strlen) +SYM_FUNC_ALIAS_WEAK(strlen, __pi_strlen) EXPORT_SYMBOL_NOKASAN(strlen) |