x86/fpu: Simplify kernel_fpu_end() (b78ea19a) · Commits · 戴 / test

Remove two little helpers and merge them into kernel_fpu_end() to streamline the function. Signed-off-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Cc: Dave Hansen <dave.hansen@intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Nicolai Stange <nstange@suse.de> Cc: Rik van Riel <riel@surriel.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/20190604071524.12835-2-hch@lst.de

arch/x86/kernel/fpu/core.c

+3 −12

Original line number	Diff line number	Diff line
		@@ -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);