diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-28 14:59:34 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-10-28 14:59:34 +0000 |
commit | 20f96e606509ee5084690179afe1810b95617a92 (patch) | |
tree | 895c5fd7fd8b3d6c7a4afda9c82dc02bbe5fcc7a /arch/arm/lib/memmove.S | |
parent | 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 (diff) | |
parent | fc2933c133744305236793025b00c2f7d258b687 (diff) |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/lib/memmove.S')
-rw-r--r-- | arch/arm/lib/memmove.S | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S index b50e5770fb44..fd123ea5a5a4 100644 --- a/arch/arm/lib/memmove.S +++ b/arch/arm/lib/memmove.S @@ -24,12 +24,14 @@ * occurring in the opposite direction. */ +.weak memmove +ENTRY(__memmove) ENTRY(memmove) UNWIND( .fnstart ) subs ip, r0, r1 cmphi r2, ip - bls memcpy + bls __memcpy stmfd sp!, {r0, r4, lr} UNWIND( .fnend ) @@ -222,3 +224,4 @@ ENTRY(memmove) 18: backward_copy_shift push=24 pull=8 ENDPROC(memmove) +ENDPROC(__memmove) |