[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-10340ae130fb70352eae1ae8a00b7906d91bf166@git.kernel.org>
Date: Tue, 14 Dec 2010 00:49:20 GMT
From: tip-bot for Suresh Siddha <suresh.b.siddha@...el.com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
stable@...nel.org, suresh.b.siddha@...el.com, tglx@...utronix.de,
hpa@...ux.intel.com, jody@...ritech.com
Subject: [tip:x86/urgent] x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem()
Commit-ID: 10340ae130fb70352eae1ae8a00b7906d91bf166
Gitweb: http://git.kernel.org/tip/10340ae130fb70352eae1ae8a00b7906d91bf166
Author: Suresh Siddha <suresh.b.siddha@...el.com>
AuthorDate: Tue, 16 Nov 2010 13:23:51 -0800
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Mon, 13 Dec 2010 16:13:11 -0800
x86, xsave: Use alloc_bootmem_align() instead of alloc_bootmem()
Alignment of alloc_bootmem() depends on the value of
L1_CACHE_SHIFT. What we need here, however, is 64 byte alignment. Use
alloc_bootmem_align() and explicitly specify the alignment instead.
This fixes a kernel boot crash reported by Jody when the cpu in .config
is set to MPENTIUMII but the kernel is booted on a xsave-capable CPU.
Reported-by: Jody Bruchon <jody@...ritech.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@...el.com>
LKML-Reference: <20101116212442.059967454@...iddha-MOBL3.sc.intel.com>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
Cc: <stable@...nel.org>
---
arch/x86/kernel/xsave.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index 9c253bd..5471285 100644
--- a/arch/x86/kernel/xsave.c
+++ b/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();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists