summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/alternative-asm.h
diff options
context:
space:
mode:
authorFenghua Yu <fenghua.yu@intel.com>2011-05-18 00:29:13 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2011-05-18 00:40:25 +0200
commit9072d11da15a71e086eab3b5085184f2c1d06913 (patch)
tree9ddd7e679443c855bb9823ef14c73e9746912c3c /arch/x86/include/asm/alternative-asm.h
parentx86, alternative, doc: Add comment for applying alternatives order (diff)
downloadlinux-9072d11da15a71e086eab3b5085184f2c1d06913.tar.xz
linux-9072d11da15a71e086eab3b5085184f2c1d06913.zip
x86, alternative: Add altinstruction_entry macro
Add altinstruction_entry macro to generate .altinstructions section entries from assembly code. This should be less failure-prone than open-coding. Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Link: http://lkml.kernel.org/r/1305671358-14478-5-git-send-email-fenghua.yu@intel.com Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/alternative-asm.h')
-rw-r--r--arch/x86/include/asm/alternative-asm.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index a63a68be1cce..94d420b360d1 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/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__ */