1 files changed, 3 insertions, 6 deletions

diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
index 6fec2d1cebe1..01c805ba5359 100644
--- a/arch/x86/lib/copy_page_64.S
+++ b/arch/x86/lib/copy_page_64.S
@@ -2,6 +2,7 @@
 
 #include <linux/linkage.h>
 #include <asm/dwarf2.h>
+#include <asm/alternative-asm.h>
 
         ALIGN
 copy_page_c:
@@ -110,10 +111,6 @@ ENDPROC(copy_page)
 2:
         .previous
         .section .altinstructions,"a"
-        .align 8
-        .quad copy_page
-        .quad 1b
-        .word X86_FEATURE_REP_GOOD
-        .byte .Lcopy_page_end - copy_page
-        .byte 2b - 1b
+        altinstruction_entry copy_page, 1b, X86_FEATURE_REP_GOOD,       \
+                .Lcopy_page_end-copy_page, 2b-1b
         .previous