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

[pandora-kernel.git] / arch / x86 / include / asm / alternative-asm.h

diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index a63a68b..94d420b 100644 (file)
--- 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__  */