x86/fpu: Cleanup fpu__init_system_xstate_size_legacy()

Clean the function up before making changes.

No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20211014230739.184014242@linutronix.de

diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c
index 65d763faace9898878924df1dda9b5376fab1653..c9293ade321d50a3593d0086b447a142bb6ddb75 100644 (file)
--- a/arch/x86/kernel/fpu/init.c
+++ b/arch/x86/kernel/fpu/init.c
@@ -199,17 +199,12 @@ static void __init fpu__init_system_xstate_size_legacy(void)
         * Note that xstate sizes might be overwritten later during
         * fpu__init_system_xstate().
         */
-
-       if (!boot_cpu_has(X86_FEATURE_FPU)) {
+       if (!cpu_feature_enabled(X86_FEATURE_FPU))
                fpu_kernel_xstate_size = sizeof(struct swregs_state);
-       } else {
-               if (boot_cpu_has(X86_FEATURE_FXSR))
-                       fpu_kernel_xstate_size =
-                               sizeof(struct fxregs_state);
-               else
-                       fpu_kernel_xstate_size =
-                               sizeof(struct fregs_state);
-       }
+       else if (cpu_feature_enabled(X86_FEATURE_FXSR))
+               fpu_kernel_xstate_size = sizeof(struct fxregs_state);
+       else
+               fpu_kernel_xstate_size = sizeof(struct fregs_state);
 
        fpu_user_xstate_size = fpu_kernel_xstate_size;
        fpstate_reset(&current->thread.fpu);