commit b564a6aadb74d727c69ec47a40dcc81f17699214
Author: Andy Lutomirski <luto@mit.edu>
Date:   Thu Sep 15 10:52:05 2011 -0700

    x86: Fix altinstruction_entry alignment on 32-bit builds
    
    The alignment should be 4 on 32 bit builds and 8 on 64-bit builds.
    This fixes a failure to boot on some configurations.
    
    Signed-off-by: Andy Lutomirski <luto@mit.edu>

diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index 4554cc6..d00dc2a 100644
--- a/arch/x86/include/asm/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
@@ -16,7 +16,7 @@
 #endif
 
 .macro altinstruction_entry orig alt feature orig_len alt_len
-	.align 8
+	_ASM_ALIGN
 	.long \orig - .
 	.long \alt - .
 	.word \feature