Commit 2ce03d85 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Rename fpu__activate_curr() to fpu__initialize() 

Rename this function to better express that it's all about
initializing the FPU state of a task which goes hand in hand
with the fpu::initialized field.

Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Eric Biggers <ebiggers3@gmail.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yu-cheng Yu <yu-cheng.yu@intel.com>
Link: http://lkml.kernel.org/r/20170923130016.21448-33-mingo@kernel.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent e10078eb

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
/*

 * High level FPU state handling functions:

 */

extern void fpu__activate_curr(struct fpu *fpu);

extern void fpu__initialize(struct fpu *fpu);

extern void fpu__activate_fpstate_read(struct fpu *fpu);

extern void fpu__activate_fpstate_write(struct fpu *fpu);

extern void fpu__save(struct fpu *fpu);

arch/x86/kernel/fpu/core.c

+4 −4
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ int fpu__copy(struct fpu *dst_fpu, struct fpu *src_fpu) 
 * Activate the current task's in-memory FPU context,

 * if it has not been used before:

 */

void fpu__activate_curr(struct fpu *fpu)

void fpu__initialize(struct fpu *fpu)

{

	WARN_ON_FPU(fpu != &current->thread.fpu);
@@ -237,7 +237,7 @@ void fpu__activate_curr(struct fpu *fpu) 
		fpu->initialized = 1;

	}

}

EXPORT_SYMBOL_GPL(fpu__activate_curr);

EXPORT_SYMBOL_GPL(fpu__initialize);



/*

 * This function must be called before we read a task's fpstate.
@@ -316,7 +316,7 @@ void fpu__activate_fpstate_write(struct fpu *fpu) 
 */

void fpu__restore(struct fpu *fpu)

{

	fpu__activate_curr(fpu);

	fpu__initialize(fpu);



	/* Avoid __kernel_fpu_begin() right after fpregs_activate() */

	kernel_fpu_disable();
@@ -392,7 +392,7 @@ void fpu__clear(struct fpu *fpu) 
	 */

	if (static_cpu_has(X86_FEATURE_FPU)) {

		preempt_disable();

		fpu__activate_curr(fpu);

		fpu__initialize(fpu);

		user_fpu_begin();

		copy_init_fpstate_to_fpregs();

		preempt_enable();

arch/x86/kernel/fpu/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) 
	if (!access_ok(VERIFY_READ, buf, size))

		return -EACCES;



	fpu__activate_curr(fpu);

	fpu__initialize(fpu);



	if (!static_cpu_has(X86_FEATURE_FPU))

		return fpregs_soft_set(current, NULL,

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -7225,7 +7225,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 
	int r;

	sigset_t sigsaved;



	fpu__activate_curr(fpu);

	fpu__initialize(fpu);



	if (vcpu->sigset_active)

		sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);

arch/x86/math-emu/fpu_entry.c

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void math_emulate(struct math_emu_info *info) 
	struct desc_struct code_descriptor;

	struct fpu *fpu = &current->thread.fpu;



	fpu__activate_curr(fpu);

	fpu__initialize(fpu);



#ifdef RE_ENTRANT_CHECKING

	if (emulating) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE