diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-04-27 10:08:48 +0800 |
commit | a79bee58f4fc3cc237fc86667edf2d0b9dce0173 (patch) | |
tree | 7d1df3ba21a3de136cd0649caeec50f793133a03 /arch/arm64/lib/memmove.S | |
parent | ef59ba115fc76ea4c21030f49e31fe18e9055679 (diff) | |
parent | e0ac66e00b01f6ff4e8274a4b5c008a26583c1b9 (diff) |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-androidlsk-v3.18-16.04-android
Conflicts:
arch/arm64/kernel/head.S
arch/arm64/mm/Makefile
Diffstat (limited to 'arch/arm64/lib/memmove.S')
-rw-r--r-- | arch/arm64/lib/memmove.S | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm64/lib/memmove.S b/arch/arm64/lib/memmove.S index 57b19ea2dad4..a5a4459013b1 100644 --- a/arch/arm64/lib/memmove.S +++ b/arch/arm64/lib/memmove.S @@ -57,12 +57,14 @@ C_h .req x12 D_l .req x13 D_h .req x14 + .weak memmove +ENTRY(__memmove) ENTRY(memmove) cmp dstin, src - b.lo memcpy + b.lo __memcpy add tmp1, src, count cmp dstin, tmp1 - b.hs memcpy /* No overlap. */ + b.hs __memcpy /* No overlap. */ add dst, dstin, count add src, src, count @@ -194,4 +196,5 @@ ENTRY(memmove) tst count, #0x3f b.ne .Ltail63 ret -ENDPROC(memmove) +ENDPIPROC(memmove) +ENDPROC(__memmove) |