x86/fpu: Remove __save_init_fpu()

__save_init_fpu() is just a trivial wrapper around fpu_save_init().

Remove the extra layer of obfuscation.

Reviewed-by: Borislav Petkov <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Fenghua Yu <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
index 16a1c66cf4ee04795214b7651d1d6f6e5338deb7..1e2b6c67b1f1b810852441dafb59a0e3f93e98ac 100644 (file)
--- a/arch/x86/include/asm/fpu-internal.h
+++ b/arch/x86/include/asm/fpu-internal.h
@@ -295,11 +295,6 @@ static inline int fpu_save_init(struct fpu *fpu)
        return 1;
 }
 
-static inline int __save_init_fpu(struct task_struct *tsk)
-{
-       return fpu_save_init(&tsk->thread.fpu);
-}
-
 static inline int fpu_restore_checking(struct fpu *fpu)
 {
        if (use_xsave())
@@ -439,7 +434,7 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta
                      (use_eager_fpu() || new->thread.fpu.counter > 5);
 
        if (__thread_has_fpu(old)) {
-               if (!__save_init_fpu(old))
+               if (!fpu_save_init(&old->thread.fpu))
                        task_disable_lazy_fpu_restore(old);
                else
                        old->thread.fpu.last_cpu = cpu;

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index e898e83afa0ac04717d1bca82d8bfb2e3af0851f..6ce971ccd85b854dea4a4bfbd0f3d362ca52a7e2 100644 (file)
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -97,7 +97,7 @@ void __kernel_fpu_begin(void)
        kernel_fpu_disable();
 
        if (__thread_has_fpu(me)) {
-               __save_init_fpu(me);
+               fpu_save_init(&me->thread.fpu);
        } else {
                this_cpu_write(fpu_owner_task, NULL);
                if (!use_eager_fpu())
@@ -135,7 +135,7 @@ void fpu__save(struct task_struct *tsk)
                if (use_eager_fpu()) {
                        __save_fpu(tsk);
                } else {
-                       __save_init_fpu(tsk);
+                       fpu_save_init(&tsk->thread.fpu);
                        __thread_fpu_end(tsk);
                }
        }