[PATCH 2/3] x86/fpu: Simplify kernel_fpu_begin

[Christoph Hellwig]

Merge two helpers into the main function, remove a pointless local
variable and flatten a conditional.

Signed-off-by: Christoph Hellwig <h...@lst.de>
---
 arch/x86/kernel/fpu/core.c | 35 +++++++++++------------------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 1d09af1158e1..03c2d306e6f2 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -43,12 +43,6 @@ static DEFINE_PER_CPU(bool, in_kernel_fpu);
  */
 DEFINE_PER_CPU(struct fpu *, fpu_fpregs_owner_ctx);
 
-static void kernel_fpu_disable(void)
-{
-       WARN_ON_FPU(this_cpu_read(in_kernel_fpu));
-       this_cpu_write(in_kernel_fpu, true);
-}
-
 static bool kernel_fpu_disabled(void)
 {
        return this_cpu_read(in_kernel_fpu);
@@ -88,32 +82,25 @@ bool irq_fpu_usable(void)
 }
 EXPORT_SYMBOL(irq_fpu_usable);
 
-static void __kernel_fpu_begin(void)
+void kernel_fpu_begin(void)
 {
-       struct fpu *fpu = &current->thread.fpu;
+       preempt_disable();
 
        WARN_ON_FPU(!irq_fpu_usable());
+       WARN_ON_FPU(this_cpu_read(in_kernel_fpu));
 
-       kernel_fpu_disable();
+       this_cpu_write(in_kernel_fpu, true);
 
-       if (current->mm) {
-               if (!test_thread_flag(TIF_NEED_FPU_LOAD)) {
-                       set_thread_flag(TIF_NEED_FPU_LOAD);
-                       /*
-                        * Ignore return value -- we don't care if reg state
-                        * is clobbered.
-                        */
-                       copy_fpregs_to_fpstate(fpu);
-               }
+       if (current->mm && !test_thread_flag(TIF_NEED_FPU_LOAD)) {
+               set_thread_flag(TIF_NEED_FPU_LOAD);
+               /*
+                * Ignore return value -- we don't care if reg state
+                * is clobbered.
+                */
+               copy_fpregs_to_fpstate(&current->thread.fpu);
        }
        __cpu_invalidate_fpregs_state();
 }
-
-void kernel_fpu_begin(void)
-{
-       preempt_disable();
-       __kernel_fpu_begin();
-}
 EXPORT_SYMBOL_GPL(kernel_fpu_begin);
 
 void kernel_fpu_end(void)
-- 
2.20.1