Merge branch 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, alternatives: BUG on encountering an invalid CPU feature number
  x86, alternatives: Fix one more open-coded 8-bit alternative number
  x86, alternatives: Use 16-bit numbers for cpufeature index

5 files changed, 5 insertions, 5 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/copy_user_64.S b/arch/x86/lib/copy_user_64.S
index 71100c98e337..a460158b5ac5 100644
--- a/arch/x86/lib/copy_user_64.S
+++ b/arch/x86/lib/copy_user_64.S
@@ -29,7 +29,7 @@
         .align 8
         .quad  0b
         .quad  2b
-        .byte  \feature                 /* when feature is set */
+        .word  \feature                 /* when feature is set */
         .byte  5
         .byte  5
         .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