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

Commit 1361ef29 authored by Rik van Riel's avatar Rik van Riel Committed by Borislav Petkov
Browse files

x86/fpu: Use an explicit if/else in switch_fpu_prepare() 



Use an explicit if/else branch after __save_init_fpu(old) in
switch_fpu_prepare(). This makes substituting the assignment with a call
in task_disable_lazy_fpu_restore() in the next patch easier to review.

Signed-off-by: default avatarRik van Riel <riel@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Link: http://lkml.kernel.org/r/1423252925-14451-7-git-send-email-riel@redhat.com


[ Space out stuff for more readability. ]
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
parent 33e03ded

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

+9 −5
Original line number Original line Diff line number Diff line
@@ -434,13 +434,17 @@ static inline fpu_switch_t switch_fpu_prepare(struct task_struct *old, struct ta 
	 * If the task has used the math, pre-load the FPU on xsave processors

	 * If the task has used the math, pre-load the FPU on xsave processors

	 * or if the past 5 consecutive context-switches used math.

	 * or if the past 5 consecutive context-switches used math.

	 */

	 */

	fpu.preload = tsk_used_math(new) && (use_eager_fpu() ||

	fpu.preload = tsk_used_math(new) &&

					     new->thread.fpu_counter > 5);

		      (use_eager_fpu() || new->thread.fpu_counter > 5);



	if (__thread_has_fpu(old)) {

	if (__thread_has_fpu(old)) {

		if (!__save_init_fpu(old))

		if (!__save_init_fpu(old))

			cpu = ~0;

			old->thread.fpu.last_cpu = ~0;

		else

			old->thread.fpu.last_cpu = cpu;

			old->thread.fpu.last_cpu = cpu;

		old->thread.fpu.has_fpu = 0;	/* But leave fpu_owner_task! */



		/* But leave fpu_owner_task! */

		old->thread.fpu.has_fpu = 0;





		/* Don't change CR0.TS if we just switch! */

		/* Don't change CR0.TS if we just switch! */

		if (fpu.preload) {

		if (fpu.preload) {