[PATCH 1/3] x86/fpu: Simplify kernel_fpu_end

[Christoph Hellwig]

Remove two little helpers and merge them into kernel_fpu_end to
streamline the function.

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

diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c
index 466fca686fb9..1d09af1158e1 100644
--- a/arch/x86/kernel/fpu/core.c
+++ b/arch/x86/kernel/fpu/core.c
@@ -49,12 +49,6 @@ static void kernel_fpu_disable(void)
        this_cpu_write(in_kernel_fpu, true);
 }
 
-static void kernel_fpu_enable(void)
-{
-       WARN_ON_FPU(!this_cpu_read(in_kernel_fpu));
-       this_cpu_write(in_kernel_fpu, false);
-}
-
 static bool kernel_fpu_disabled(void)
 {
        return this_cpu_read(in_kernel_fpu);
@@ -115,11 +109,6 @@ static void __kernel_fpu_begin(void)
        __cpu_invalidate_fpregs_state();
 }
 
-static void __kernel_fpu_end(void)
-{
-       kernel_fpu_enable();
-}
-
 void kernel_fpu_begin(void)
 {
        preempt_disable();
@@ -129,7 +118,9 @@ EXPORT_SYMBOL_GPL(kernel_fpu_begin);
 
 void kernel_fpu_end(void)
 {
-       __kernel_fpu_end();
+       WARN_ON_FPU(!this_cpu_read(in_kernel_fpu));
+
+       this_cpu_write(in_kernel_fpu, false);
        preempt_enable();
 }
 EXPORT_SYMBOL_GPL(kernel_fpu_end);
-- 
2.20.1