summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/fpu
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-04-04 22:24:57 +0200
committerIngo Molnar <mingo@kernel.org>2016-04-13 11:37:40 +0200
commitdda9edf7c1fdc0d7a7ed7f46299a26282190fb6d (patch)
treef6ef634d3ae1d1ef7e7caa1d35211986e9306446 /arch/x86/kernel/fpu
parentx86/cpufeature: Replace cpu_has_avx with boot_cpu_has() usage (diff)
downloadlinux-dda9edf7c1fdc0d7a7ed7f46299a26282190fb6d.tar.xz
linux-dda9edf7c1fdc0d7a7ed7f46299a26282190fb6d.zip
x86/cpufeature: Replace cpu_has_xmm with boot_cpu_has() usage
Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1459801503-15600-5-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/fpu')
-rw-r--r--arch/x86/kernel/fpu/core.c2
-rw-r--r--arch/x86/kernel/fpu/init.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 8e37cc8a539a..b05aa68f88c0 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -526,7 +526,7 @@ static inline unsigned short get_fpu_swd(struct fpu *fpu)
static inline unsigned short get_fpu_mxcsr(struct fpu *fpu)
{
- if (cpu_has_xmm) {
+ if (boot_cpu_has(X86_FEATURE_XMM)) {
return fpu->state.fxsave.mxcsr;
} else {
return MXCSR_DEFAULT;
diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
index 54c86fffbf9f..9bbb332a71ff 100644
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
@@ -31,7 +31,7 @@ static void fpu__init_cpu_generic(void)
if (cpu_has_fxsr)
cr4_mask |= X86_CR4_OSFXSR;
- if (cpu_has_xmm)
+ if (boot_cpu_has(X86_FEATURE_XMM))
cr4_mask |= X86_CR4_OSXMMEXCPT;
if (cr4_mask)
cr4_set_bits(cr4_mask);