s390/kasan: remove override of mem*() functions

[linux-2.6-microblaze.git] / arch / s390 / lib / mem.S

diff --git a/arch/s390/lib/mem.S b/arch/s390/lib/mem.S
index dc0874f..2e04804 100644 (file)
--- a/arch/s390/lib/mem.S
+++ b/arch/s390/lib/mem.S
@@ -14,8 +14,7 @@
 /*
  * void *memmove(void *dest, const void *src, size_t n)
  */
-WEAK(memmove)
-ENTRY(__memmove)
+SYM_FUNC_START(__memmove)
        ltgr    %r4,%r4
        lgr     %r1,%r2
        jz      .Lmemmove_exit
@@ -48,7 +47,10 @@ ENTRY(__memmove)
        BR_EX   %r14
 .Lmemmove_mvc:
        mvc     0(1,%r1),0(%r3)
-ENDPROC(__memmove)
+SYM_FUNC_END(__memmove)
+EXPORT_SYMBOL(__memmove)
+
+SYM_FUNC_ALIAS(memmove, __memmove)
 EXPORT_SYMBOL(memmove)
 
 /*
@@ -66,8 +68,7 @@ EXPORT_SYMBOL(memmove)
  *     return __builtin_memset(s, c, n);
  * }
  */
-WEAK(memset)
-ENTRY(__memset)
+SYM_FUNC_START(__memset)
        ltgr    %r4,%r4
        jz      .Lmemset_exit
        ltgr    %r3,%r3
@@ -111,7 +112,10 @@ ENTRY(__memset)
        xc      0(1,%r1),0(%r1)
 .Lmemset_mvc:
        mvc     1(1,%r1),0(%r1)
-ENDPROC(__memset)
+SYM_FUNC_END(__memset)
+EXPORT_SYMBOL(__memset)
+
+SYM_FUNC_ALIAS(memset, __memset)
 EXPORT_SYMBOL(memset)
 
 /*
@@ -119,8 +123,7 @@ EXPORT_SYMBOL(memset)
  *
  * void *memcpy(void *dest, const void *src, size_t n)
  */
-WEAK(memcpy)
-ENTRY(__memcpy)
+SYM_FUNC_START(__memcpy)
        ltgr    %r4,%r4
        jz      .Lmemcpy_exit
        aghi    %r4,-1
@@ -141,7 +144,10 @@ ENTRY(__memcpy)
        j       .Lmemcpy_remainder
 .Lmemcpy_mvc:
        mvc     0(1,%r1),0(%r3)
-ENDPROC(__memcpy)
+SYM_FUNC_END(__memcpy)
+EXPORT_SYMBOL(__memcpy)
+
+SYM_FUNC_ALIAS(memcpy, __memcpy)
 EXPORT_SYMBOL(memcpy)
 
 /*