@@ -199,17 +199,12 @@ static void __init fpu__init_system_xsta
* 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(¤t->thread.fpu);
Clean the function up before making changes. No functional change. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> --- arch/x86/kernel/fpu/init.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)