diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index b1f5dd63cfebc8d9c3c70552fb49d4f1ec40a2b3..95e04cb1ed2f46cc6e2fcc3161b853cc42e69d44 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h @@ -265,7 +265,7 @@ static inline void fpu_fxsave(struct fpu *fpu) static inline int fpu_save_init(struct fpu *fpu) { if (use_xsave()) { - fpu_xsave(fpu); + xsave_state(&fpu->state->xsave); /* * xsave header may indicate the init state of the FP. diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h index 61c951ce77fe54767a640396b2ca110d36e26f43..7c90ea93c54eec4457c2e8e30363ff26b38b6562 100644 --- a/arch/x86/include/asm/xsave.h +++ b/arch/x86/include/asm/xsave.h @@ -186,14 +186,6 @@ static inline int xrstor_state(struct xsave_struct *fx, u64 mask) return err; } -/* - * Save xstate context for old process during context switch. - */ -static inline void fpu_xsave(struct fpu *fpu) -{ - xsave_state(&fpu->state->xsave); -} - /* * Restore xstate context for new process during context switch. */ diff --git a/arch/x86/mm/mpx.c b/arch/x86/mm/mpx.c index 37ad432e7f160a310a9cff3ab2b274c230220021..412b5f81e54718801170f8b83aa8e1471fa77a43 100644 --- a/arch/x86/mm/mpx.c +++ b/arch/x86/mm/mpx.c @@ -389,7 +389,7 @@ int mpx_enable_management(struct task_struct *tsk) * directory into XSAVE/XRSTOR Save Area and enable MPX through * XRSTOR instruction. * - * fpu_xsave() is expected to be very expensive. Storing the bounds + * xsave_state() is expected to be very expensive. Storing the bounds * directory here means that we do not have to do xsave in the unmap * path; we can just use mm->bd_addr instead. */