Merge remote-tracking branch 'input/next'

[karo-tx-linux.git] / arch / arm64 / lib / memcpy.S

diff --git a/arch/arm64/lib/memcpy.S b/arch/arm64/lib/memcpy.S
index 173a1aace9bbb97951f96e27c26f245ff7f0396b..67613937711f10d209b3be73ce6a322f674581b5 100644 (file)
--- a/arch/arm64/lib/memcpy.S
+++ b/arch/arm64/lib/memcpy.S
@@ -68,7 +68,10 @@
        stp \ptr, \regB, [\regC], \val
        .endm
 
+       .weak memcpy
+ENTRY(__memcpy)
 ENTRY(memcpy)
 #include "copy_template.S"
        ret
-ENDPROC(memcpy)
+ENDPIPROC(memcpy)
+ENDPROC(__memcpy)