Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2d0ac9a authored by Borislav Petkov's avatar Borislav Petkov Committed by Ingo Molnar
Browse files

x86/fpu: Fold __drop_fpu() into its sole user 



Fold it into drop_fpu(). Phew, one less FPU function to pay attention
to.

No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Pekka Riikonen <priikone@iki.fi>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent f893959b

arch/x86/include/asm/fpu-internal.h

+7 −10
Original line number Diff line number Diff line
@@ -378,8 +378,14 @@ static inline void __thread_fpu_begin(struct task_struct *tsk) 
	__thread_set_has_fpu(tsk);

}



static inline void __drop_fpu(struct task_struct *tsk)

static inline void drop_fpu(struct task_struct *tsk)

{

	/*

	 * Forget coprocessor state..

	 */

	preempt_disable();

	tsk->thread.fpu_counter = 0;



	if (__thread_has_fpu(tsk)) {

		/* Ignore delayed exceptions from user space */

		asm volatile("1: fwait\n"
@@ -387,16 +393,7 @@ static inline void __drop_fpu(struct task_struct *tsk) 
			     _ASM_EXTABLE(1b, 2b));

		__thread_fpu_end(tsk);

	}

}



static inline void drop_fpu(struct task_struct *tsk)

{

	/*

	 * Forget coprocessor state..

	 */

	preempt_disable();

	tsk->thread.fpu_counter = 0;

	__drop_fpu(tsk);

	clear_stopped_child_used_math(tsk);

	preempt_enable();

}