From 36e8c88b2420cb2871d552f5317160f9bdfb1713 Mon Sep 17 00:00:00 2001
From: Andy Lutomirski <luto@mit.edu>
Date: Thu, 25 Aug 2011 16:10:33 -0400
Subject: [PATCH] --- yaml --- r: 263323 b: refs/heads/master c:
 b4ca46e4e82a0a5976fe5eab85be585d75f8202f h: refs/heads/master i:   263321:
 cd286bb7476d7bde1112be038f14e81a1e840afc   263319:
 d5a3950d5c46039033adac2fbf261c70ede5f604 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/entry_32.S | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5ad7378a9251..5dfade461948 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbbfa38fcb95930babc5233cf6927ec430f38abc
+refs/heads/master: b4ca46e4e82a0a5976fe5eab85be585d75f8202f
diff --git a/trunk/arch/x86/kernel/entry_32.S b/trunk/arch/x86/kernel/entry_32.S
index 5c1a91974918..f3f6f5344001 100644
--- a/trunk/arch/x86/kernel/entry_32.S
+++ b/trunk/arch/x86/kernel/entry_32.S
@@ -54,6 +54,7 @@
 #include <asm/ftrace.h>
 #include <asm/irq_vectors.h>
 #include <asm/cpufeature.h>
+#include <asm/alternative-asm.h>
 
 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
 #include <linux/elf-em.h>
@@ -873,12 +874,7 @@ ENTRY(simd_coprocessor_error)
 661:	pushl_cfi $do_general_protection
 662:
 .section .altinstructions,"a"
-	.balign 4
-	.long 661b
-	.long 663f
-	.word X86_FEATURE_XMM
-	.byte 662b-661b
-	.byte 664f-663f
+	altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
 .previous
 .section .altinstr_replacement,"ax"
 663:	pushl $do_simd_coprocessor_error