From 78df506fe8692fa1c5c10744be5cb9e06cd310b0 Mon Sep 17 00:00:00 2001
From: Fenghua Yu <fenghua.yu@intel.com>
Date: Tue, 17 May 2011 15:29:13 -0700
Subject: [PATCH] --- yaml --- r: 245515 b: refs/heads/master c:
 9072d11da15a71e086eab3b5085184f2c1d06913 h: refs/heads/master i:   245513:
 fc2efd92bd09816c69b97e1d187a905a7164ba1c   245511:
 c43269d9562664919ccc6ec5637260ddf2ad4450 v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/include/asm/alternative-asm.h | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 74bb6870c24d..827591c6257a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 509731336313b3799cf03071d72c64fa6383895e
+refs/heads/master: 9072d11da15a71e086eab3b5085184f2c1d06913
diff --git a/trunk/arch/x86/include/asm/alternative-asm.h b/trunk/arch/x86/include/asm/alternative-asm.h
index a63a68be1cce..94d420b360d1 100644
--- a/trunk/arch/x86/include/asm/alternative-asm.h
+++ b/trunk/arch/x86/include/asm/alternative-asm.h
@@ -15,4 +15,13 @@
 	.endm
 #endif
 
+.macro altinstruction_entry orig alt feature orig_len alt_len
+	.align 8
+	.quad \orig
+	.quad \alt
+	.word \feature
+	.byte \orig_len
+	.byte \alt_len
+.endm
+
 #endif  /*  __ASSEMBLY__  */