diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:24 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-12-21 11:19:24 +0000 |
| commit | 8cc9251737d1883e33fd0a7dafbd4062916c1ca6 (patch) | |
| tree | 6a1901ccbce167330049ce9b2afced122b325c4a /arch/arm/lib | |
| parent | e64ab473dddaffdfc4bd0b385204f472f2cb00d6 (diff) | |
| parent | 10fce53c0ef8f6e79115c3d9e0d7ea1338c3fa37 (diff) | |
| download | linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.tar.gz linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.tar.bz2 linux-8cc9251737d1883e33fd0a7dafbd4062916c1ca6.zip | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/memcpy.S | 4 | ||||
| -rw-r--r-- | arch/arm/lib/memmove.S | 6 | ||||
| -rw-r--r-- | arch/arm/lib/memset.S | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/lib/memcpy.S b/arch/arm/lib/memcpy.S index 09a333153dc6..e4caf48c089f 100644 --- a/arch/arm/lib/memcpy.S +++ b/arch/arm/lib/memcpy.S @@ -58,10 +58,12 @@ /* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ +ENTRY(__memcpy) ENTRY(mmiocpy) -ENTRY(memcpy) +WEAK(memcpy) #include "copy_template.S" ENDPROC(memcpy) ENDPROC(mmiocpy) +ENDPROC(__memcpy) diff --git a/arch/arm/lib/memmove.S b/arch/arm/lib/memmove.S index b50e5770fb44..6fecc12a1f51 100644 --- a/arch/arm/lib/memmove.S +++ b/arch/arm/lib/memmove.S @@ -24,12 +24,13 @@ * occurring in the opposite direction. */ -ENTRY(memmove) +ENTRY(__memmove) +WEAK(memmove) UNWIND( .fnstart ) subs ip, r0, r1 cmphi r2, ip - bls memcpy + bls __memcpy stmfd sp!, {r0, r4, lr} UNWIND( .fnend ) @@ -222,3 +223,4 @@ ENTRY(memmove) 18: backward_copy_shift push=24 pull=8 ENDPROC(memmove) +ENDPROC(__memmove) diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 6ca4535c47fb..9817cb258c1a 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -13,8 +13,9 @@ .text .align 5 +ENTRY(__memset) ENTRY(mmioset) -ENTRY(memset) +WEAK(memset) UNWIND( .fnstart ) ands r3, r0, #3 @ 1 unaligned? mov ip, r0 @ preserve r0 as return value @@ -132,6 +133,7 @@ UNWIND( .fnstart ) UNWIND( .fnend ) ENDPROC(memset) ENDPROC(mmioset) +ENDPROC(__memset) ENTRY(__memset32) UNWIND( .fnstart ) |