[PATCH 015/208] x86/fpu: Rename fpu_finit() to fpstate_init()

Ingo Molnar
2015-05-05T17:05:34Z

Make it clear that we are initializing the in-memory FPU context area,
no the FPU registers.

Also move it to the fpu__*() namespace.

Reviewed-by: Borislav 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: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/include/asm/i387.h | 2 +-
arch/x86/kernel/i387.c | 8 ++++----
arch/x86/kernel/xsave.c | 2 +-
arch/x86/kvm/x86.c | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
index 0367d17371f5..6552a16e0e38 100644
--- a/arch/x86/include/asm/i387.h
+++ b/arch/x86/include/asm/i387.h
@@ -19,8 +19,8 @@ struct pt_regs;
struct user_i387_struct;

extern int fpstate_alloc_init(struct task_struct *curr);
+extern void fpstate_init(struct fpu *fpu);

-extern void fpu_finit(struct fpu *fpu);
extern int dump_fpu(struct pt_regs *, struct user_i387_struct *);
extern void math_state_restore(void);

diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
index 5f2feb63b72a..e0c16e86deb0 100644
--- a/arch/x86/kernel/i387.c
+++ b/arch/x86/kernel/i387.c
@@ -225,7 +225,7 @@ void fpu_init(void)
eager_fpu_init();
}

-void fpu_finit(struct fpu *fpu)
+void fpstate_init(struct fpu *fpu)
{
if (!cpu_has_fpu) {
finit_soft_fpu(&fpu->state->soft);
@@ -244,7 +244,7 @@ void fpu_finit(struct fpu *fpu)
fp->fos = 0xffff0000u;
}
}
-EXPORT_SYMBOL_GPL(fpu_finit);
+EXPORT_SYMBOL_GPL(fpstate_init);

int fpstate_alloc(struct fpu *fpu)
{
@@ -284,7 +284,7 @@ int fpstate_alloc_init(struct task_struct *curr)
if (ret)
return ret;

- fpu_finit(&curr->thread.fpu);
+ fpstate_init(&curr->thread.fpu);

/* Safe to do for the current task: */
curr->flags |= PF_USED_MATH;
@@ -318,7 +318,7 @@ static int fpu__unlazy_stopped(struct task_struct *child)
if (ret)
return ret;

- fpu_finit(&child->thread.fpu);
+ fpstate_init(&child->thread.fpu);

/* Safe to do for stopped child tasks: */
child->flags |= PF_USED_MATH;
diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
index a977cdd03825..163b5cc582ef 100644
--- a/arch/x86/kernel/xsave.c
+++ b/arch/x86/kernel/xsave.c
@@ -395,7 +395,7 @@ int __restore_xstate_sig(void __user *buf, void __user *buf_fx, int size)

if (__copy_from_user(&fpu->state->xsave, buf_fx, state_size) ||
__copy_from_user(&env, buf, sizeof(env))) {
- fpu_finit(fpu);
+ fpstate_init(fpu);
err = -1;
} else {
sanitize_restored_xstate(tsk, &env, xstate_bv, fx_only);
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 80a411c83083..26b1f89fc608 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -7011,7 +7011,7 @@ int fx_init(struct kvm_vcpu *vcpu)
if (err)
return err;

- fpu_finit(&vcpu->arch.guest_fpu);
+ fpstate_init(&vcpu->arch.guest_fpu);
if (cpu_has_xsaves)
vcpu->arch.guest_fpu.state->xsave.xsave_hdr.xcomp_bv =
host_xcr0 | XSTATE_COMPACTION_ENABLED;
--
2.1.0