diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2020-11-10 13:46:21 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-10 13:46:21 -0300 |
| commit | d96d648dcbbcdf5ecd69193772efe982aafb70d5 (patch) | |
| tree | 97eb653b72833e4fd6a21a1d30a0baf165dbd368 /arch/arm64/lib/memset.S | |
| parent | ad4c64e47c85a8e6d16ab61aa45d4bd4b645228d (diff) | |
| parent | 6b8c5b31298fa141016d304e68fdd912106e4718 (diff) | |
Merge pull request #171 from zandrey/5.4-2.1.x-imx
Update 5.4-2.1.x-imx to v5.4.76 from stable
Diffstat (limited to 'arch/arm64/lib/memset.S')
| -rw-r--r-- | arch/arm64/lib/memset.S | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm64/lib/memset.S b/arch/arm64/lib/memset.S index 9fb97e6bc560..a9c1c9a01ea9 100644 --- a/arch/arm64/lib/memset.S +++ b/arch/arm64/lib/memset.S @@ -42,9 +42,8 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 - .weak memset -ENTRY(__memset) -ENTRY(memset) +SYM_FUNC_START_ALIAS(__memset) +SYM_FUNC_START_WEAK_PI(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 orr A_lw, A_lw, A_lw, lsl #8 @@ -203,7 +202,7 @@ ENTRY(memset) ands count, count, zva_bits_x b.ne .Ltail_maybe_long ret -ENDPIPROC(memset) +SYM_FUNC_END_PI(memset) EXPORT_SYMBOL(memset) -ENDPROC(__memset) +SYM_FUNC_END_ALIAS(__memset) EXPORT_SYMBOL(__memset) |