Prev: [PATCH 03/10] x86: removing boot_cpu_id variable
Next: [PATCH 05/10] x86, xsave: make xsave_cntxt_init() static
From: Robert Richter on 20 Jul 2010 15:00
This moves the cpu_has_xsave check at the beginning of
xsave_init(). All other checks may removed then.

Signed-off-by: Robert Richter <robert.richter(a)amd.com>
---
arch/x86/kernel/xsave.c | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index a594f49..550bf45 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -362,9 +362,6 @@ unsigned int sig_xstate_size = sizeof(struct _fpstate);
*/
static void __cpuinit __xsave_init(void)
{
- if (!cpu_has_xsave)
- return;
-
set_in_cr4(X86_CR4_OSXSAVE);

/*
@@ -433,9 +430,6 @@ static void __cpuinit xsave_cntxt_init(void)
{
unsigned int eax, ebx, ecx, edx;

- if (!cpu_has_xsave)
- return;
-
cpuid_count(0xd, 0, &eax, &ebx, &ecx, &edx);
pcntxt_mask = eax + ((u64)edx << 32);

@@ -469,6 +463,9 @@ static void __cpuinit xsave_cntxt_init(void)

void __cpuinit xsave_init(void)
{
+ if (!cpu_has_xsave)
+ return;
+
/*
* Boot processor to setup the FP and extended state context info.
*/
--
1.7.1.1


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 03/10] x86: removing boot_cpu_id variable
Next: [PATCH 05/10] x86, xsave: make xsave_cntxt_init() static