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/memset.S | |
parent | 9fa2e7af3d53a4b769136eccc32c02e128a4ee51 (diff) | |
parent | fc2933c133744305236793025b00c2f7d258b687 (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index 6ca4535c47fb..0e7ff0423f50 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -13,6 +13,8 @@ .text .align 5 +.weak memset +ENTRY(__memset) ENTRY(mmioset) ENTRY(memset) UNWIND( .fnstart ) @@ -132,6 +134,7 @@ UNWIND( .fnstart ) UNWIND( .fnend ) ENDPROC(memset) ENDPROC(mmioset) +ENDPROC(__memset) ENTRY(__memset32) UNWIND( .fnstart ) |