summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-04-25 09:21:08 +0300
committerIngo Molnar <mingo@kernel.org>2015-05-19 16:47:41 +0300
commit429ced50a0e5f863f95b100749043451e1968c4c (patch)
treed57b56e8aac6d5a76d0c1d2ad73c51c5d0a2eb60 /arch
parentc42103b22652dae50e1aaacb5c2767145027ab3e (diff)
downloadlinux-429ced50a0e5f863f95b100749043451e1968c4c.tar.xz
x86/fpu: Do fpu__init_system_xstate only from fpu__init_system()
Only call xstate system setup routines from fpu__init_system(). Likewise, don't call fpu__init_cpu_xstate() from fpu__init_system(). Reviewed-by: Borislav Petkov <bp@alien8.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/fpu/init.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
index 77599fe8af56..c1b2d1cfe745 100644
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
@@ -146,7 +146,6 @@ void fpu__init_cpu(void)
cr0 |= X86_CR0_EM;
write_cr0(cr0);
- fpu__init_system_xstate();
fpu__init_cpu_xstate();
}
@@ -161,7 +160,6 @@ void fpu__init_system(void)
mxcsr_feature_mask_init();
fpu__init_system_xstate();
- fpu__init_cpu_xstate();
eager_fpu_init();
}