From 20364c53023a624269c6f2b41b1616a52edaa15a Mon Sep 17 00:00:00 2001
From: Suresh Siddha <suresh.b.siddha@intel.com>
Date: Tue, 16 Nov 2010 13:23:51 -0800
Subject: [PATCH] --- yaml --- r: 223435 b: refs/heads/master c:
 10340ae130fb70352eae1ae8a00b7906d91bf166 h: refs/heads/master i:   223433:
 de4786434fe4362cf58b6cd242f86816ce6903ef   223431:
 08e3480c57d49565008771e41105ce3f7860f505 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/x86/kernel/xsave.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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();