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/memset.S | |
| parent | e64ab473dddaffdfc4bd0b385204f472f2cb00d6 (diff) | |
| parent | 10fce53c0ef8f6e79115c3d9e0d7ea1338c3fa37 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'arch/arm/lib/memset.S')
| -rw-r--r-- | arch/arm/lib/memset.S | 4 |
1 files changed, 3 insertions, 1 deletions
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 ) |