diff --git a/[refs] b/[refs]
index 866853b170ac..a41508c7c09a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53dde5f385bc56e312f78b7cb25ffaf8efd4735d
+refs/heads/master: 10340ae130fb70352eae1ae8a00b7906d91bf166
diff --git a/trunk/arch/x86/kernel/xsave.c b/trunk/arch/x86/kernel/xsave.c
index 9c253bd65e24..547128546cc3 100644
--- a/trunk/arch/x86/kernel/xsave.c
+++ b/trunk/arch/x86/kernel/xsave.c
@@ -394,7 +394,8 @@ static void __init setup_xstate_init(void)
 	 * Setup init_xstate_buf to represent the init state of
 	 * all the features managed by the xsave
 	 */
-	init_xstate_buf = alloc_bootmem(xstate_size);
+	init_xstate_buf = alloc_bootmem_align(xstate_size,
+					      __alignof__(struct xsave_struct));
 	init_xstate_buf->i387.mxcsr = MXCSR_DEFAULT;
 
 	clts();