x86, alternatives: Use 16-bit numbers for cpufeature index

We already have cpufeature indicies above 255, so use a 16-bit number
for the alternatives index.  This consumes a padding field and so
doesn't add any size, but it means that abusing the padding field to
create assembly errors on overflow no longer works.  We can retain the
test simply by redirecting it to the .discard section, however.

[ v3: updated to include open-coded locations ]

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
LKML-Reference: <tip-f88731e3068f9d1392ba71cc9f50f035d26a0d4f@git.kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

4 files changed, 4 insertions, 4 deletions

diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
index ebeafcce04a9..aa4326bfb24a 100644
--- a/arch/x86/lib/clear_page_64.S
+++ b/arch/x86/lib/clear_page_64.S
@@ -52,7 +52,7 @@ ENDPROC(clear_page)
         .align 8
         .quad clear_page
         .quad 1b
-        .byte X86_FEATURE_REP_GOOD
+        .word X86_FEATURE_REP_GOOD
         .byte .Lclear_page_end - clear_page
         .byte 2b - 1b
         .previous
diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
index 727a5d46d2fc..6fec2d1cebe1 100644
--- a/arch/x86/lib/copy_page_64.S
+++ b/arch/x86/lib/copy_page_64.S
@@ -113,7 +113,7 @@ ENDPROC(copy_page)
         .align 8
         .quad copy_page
         .quad 1b
-        .byte X86_FEATURE_REP_GOOD
+        .word X86_FEATURE_REP_GOOD
         .byte .Lcopy_page_end - copy_page
         .byte 2b - 1b
         .previous
diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
index f82e884928af..bcbcd1e0f7d5 100644
--- a/arch/x86/lib/memcpy_64.S
+++ b/arch/x86/lib/memcpy_64.S
@@ -131,7 +131,7 @@ ENDPROC(__memcpy)
         .align 8
         .quad memcpy
         .quad .Lmemcpy_c
-        .byte X86_FEATURE_REP_GOOD
+        .word X86_FEATURE_REP_GOOD
 
         /*
          * Replace only beginning, memcpy is used to apply alternatives,
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
index e88d3b81644a..09d344269652 100644
--- a/arch/x86/lib/memset_64.S
+++ b/arch/x86/lib/memset_64.S
@@ -121,7 +121,7 @@ ENDPROC(__memset)
         .align 8
         .quad memset
         .quad .Lmemset_c
-        .byte X86_FEATURE_REP_GOOD
+        .word X86_FEATURE_REP_GOOD
         .byte .Lfinal - memset
         .byte .Lmemset_e - .Lmemset_c
         .previous