Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree

Signed-off-by: Ingo Molnar <mingo@kernel.org>

3 files changed, 14 insertions, 6 deletions

diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index 56313a326188..89b53c9968e7 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@ -53,6 +53,8 @@
 .Lmemcpy_e_e:
         .previous
 
+.weak memcpy
+
 ENTRY(__memcpy)
 ENTRY(memcpy)
         CFI_STARTPROC
@@ -199,8 +201,8 @@ ENDPROC(__memcpy)
          * only outcome...
          */
         .section .altinstructions, "a"
-        altinstruction_entry memcpy,.Lmemcpy_c,X86_FEATURE_REP_GOOD,\
+        altinstruction_entry __memcpy,.Lmemcpy_c,X86_FEATURE_REP_GOOD,\
                              .Lmemcpy_e-.Lmemcpy_c,.Lmemcpy_e-.Lmemcpy_c
-        altinstruction_entry memcpy,.Lmemcpy_c_e,X86_FEATURE_ERMS, \
+        altinstruction_entry __memcpy,.Lmemcpy_c_e,X86_FEATURE_ERMS, \
                              .Lmemcpy_e_e-.Lmemcpy_c_e,.Lmemcpy_e_e-.Lmemcpy_c_e
         .previous
diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
index 65268a6104f4..9c4b530575da 100644
--- a/arch/x86/lib/memmove_64.S
+++ b/arch/x86/lib/memmove_64.S
@@ -24,7 +24,10 @@
  * Output:
  * rax: dest
  */
+.weak memmove
+
 ENTRY(memmove)
+ENTRY(__memmove)
         CFI_STARTPROC
 
         /* Handle more 32 bytes in loop */
@@ -220,4 +223,5 @@ ENTRY(memmove)
                 .Lmemmove_end_forward-.Lmemmove_begin_forward,  \
                 .Lmemmove_end_forward_efs-.Lmemmove_begin_forward_efs
         .previous
+ENDPROC(__memmove)
 ENDPROC(memmove)
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
index 2dcb3808cbda..6f44935c6a60 100644
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
@@ -56,6 +56,8 @@
 .Lmemset_e_e:
         .previous
 
+.weak memset
+
 ENTRY(memset)
 ENTRY(__memset)
         CFI_STARTPROC
@@ -147,8 +149,8 @@ ENDPROC(__memset)
          * feature to implement the right patch order.
          */
         .section .altinstructions,"a"
-        altinstruction_entry memset,.Lmemset_c,X86_FEATURE_REP_GOOD,\
-                             .Lfinal-memset,.Lmemset_e-.Lmemset_c
-        altinstruction_entry memset,.Lmemset_c_e,X86_FEATURE_ERMS, \
-                             .Lfinal-memset,.Lmemset_e_e-.Lmemset_c_e
+        altinstruction_entry __memset,.Lmemset_c,X86_FEATURE_REP_GOOD,\
+                             .Lfinal-__memset,.Lmemset_e-.Lmemset_c
+        altinstruction_entry __memset,.Lmemset_c_e,X86_FEATURE_ERMS, \
+                             .Lfinal-__memset,.Lmemset_e_e-.Lmemset_c_e
         .previous