1 files changed, 2 insertions, 3 deletions

diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index ada87a329edc..d6c28acdf99c 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -243,7 +243,7 @@ int save_xstate_sig(void __user *buf, void __user *buf_fx, int size)
         if (!access_ok(VERIFY_WRITE, buf, size))
                 return -EACCES;
 
-        if (!HAVE_HWFP)
+        if (!static_cpu_has(X86_FEATURE_FPU))
                 return fpregs_soft_get(current, NULL, 0,
                         sizeof(struct user_i387_ia32_struct), NULL,
                         (struct _fpstate_ia32 __user *) buf) ? -1 : 1;
@@ -350,11 +350,10 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)
         if (!used_math() && init_fpu(tsk))
                 return -1;
 
-        if (!HAVE_HWFP) {
+        if (!static_cpu_has(X86_FEATURE_FPU))
                 return fpregs_soft_set(current, NULL,
                                        0, sizeof(struct user_i387_ia32_struct),
                                        NULL, buf) != 0;
-        }
 
         if (use_xsave()) {
                 struct _fpx_sw_bytes fx_sw_user;