diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2022-03-15 10:32:31 +0100 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2022-03-15 10:32:31 +0100 |
| commit | 599d66b8473b4dbf3808104db8cd7538a26e3068 (patch) | |
| tree | b65505ee7f7d2830dc93657c1781e71006c01ab5 /arch/arm64/lib/strncmp.S | |
| parent | 227a06553fe6c785f23d76eece3bb10e2db5059c (diff) | |
| parent | 4013e26670c590944abdab56c4fa797527b74325 (diff) | |
| download | linux-599d66b8473b4dbf3808104db8cd7538a26e3068.tar.bz2 | |
Merge branch 'arm64/for-next/linkage'
Enjoy the cleanups and avoid conflicts vs linkage
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Diffstat (limited to 'arch/arm64/lib/strncmp.S')
| -rw-r--r-- | arch/arm64/lib/strncmp.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/lib/strncmp.S b/arch/arm64/lib/strncmp.S index e42bcfcd37e6..a848abcec975 100644 --- a/arch/arm64/lib/strncmp.S +++ b/arch/arm64/lib/strncmp.S @@ -44,7 +44,7 @@ #define endloop x15 #define count mask -SYM_FUNC_START_WEAK_PI(strncmp) +SYM_FUNC_START(__pi_strncmp) cbz limit, L(ret0) eor tmp1, src1, src2 mov zeroones, #REP8_01 @@ -256,6 +256,6 @@ L(done_loop): L(ret0): mov result, #0 ret - -SYM_FUNC_END_PI(strncmp) +SYM_FUNC_END(__pi_strncmp) +SYM_FUNC_ALIAS_WEAK(strncmp, __pi_strncmp) EXPORT_SYMBOL_NOHWKASAN(strncmp) |