From: H. Peter Anvin <hpa@linux.intel.com>
Date: Tue, 13 Jul 2010 21:55:11 +0000 (-0700)
Subject: x86, alternatives: Fix one more open-coded 8-bit alternative number
X-Git-Tag: v2.6.36-rc1~510^2~1
X-Git-Url: https://bbs.cooldavid.org/git/?a=commitdiff_plain;h=df378ccfc4dd04e263426ad805516915874774aa;p=net-next-2.6.git

x86, alternatives: Fix one more open-coded 8-bit alternative number

Fix a missing case of an 8-bit alternative number, buried inside an
assembly macro.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Reported-by: Yinghai Lu <yinhai@kernel.org>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <4C3BDDA3.2060900@kernel.org>
---

diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
index 71100c98e33..a460158b5ac 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