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

Commit dfaea4e6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Rename __thread_set_has_fpu() to __fpregs_activate() 



Propagate the 'fpu->fpregs_active' naming to the functions that
sets it.

Reviewed-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d5cea9b0

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -322,7 +322,7 @@ static inline void __thread_clear_has_fpu(struct fpu *fpu) 
}

}





/* Must be paired with a 'clts' before! */

/* Must be paired with a 'clts' before! */

static inline void __thread_set_has_fpu(struct fpu *fpu)

static inline void __fpregs_activate(struct fpu *fpu)

{

{

	fpu->fpregs_active = 1;

	fpu->fpregs_active = 1;

	this_cpu_write(fpu_fpregs_owner_ctx, fpu);

	this_cpu_write(fpu_fpregs_owner_ctx, fpu);
@@ -346,7 +346,7 @@ static inline void __thread_fpu_begin(struct fpu *fpu) 
{

{

	if (!use_eager_fpu())

	if (!use_eager_fpu())

		clts();

		clts();

	__thread_set_has_fpu(fpu);

	__fpregs_activate(fpu);

}

}





static inline void drop_fpu(struct fpu *fpu)

static inline void drop_fpu(struct fpu *fpu)
@@ -428,7 +428,7 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu) 
		/* Don't change CR0.TS if we just switch! */

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

		if (fpu.preload) {

		if (fpu.preload) {

			new_fpu->counter++;

			new_fpu->counter++;

			__thread_set_has_fpu(new_fpu);

			__fpregs_activate(new_fpu);

			prefetch(new_fpu->state);

			prefetch(new_fpu->state);

		} else if (!use_eager_fpu())

		} else if (!use_eager_fpu())

			stts();

			stts();