From 5a12bf6332da40310eff5575ca1ba20339d74e48 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 22 Apr 2015 15:58:37 +0200 Subject: [PATCH] x86/fpu: Uninline fpstate_free() and move it next to the allocation function Reviewed-by: Borislav Petkov Cc: Andy Lutomirski Cc: Dave Hansen Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/include/asm/fpu-internal.h | 9 +-------- arch/x86/kernel/fpu/core.c | 9 +++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h index 6c1ceb7c3f9a..16a1c66cf4ee 100644 --- a/arch/x86/include/asm/fpu-internal.h +++ b/arch/x86/include/asm/fpu-internal.h @@ -567,16 +567,9 @@ static inline unsigned short get_fpu_mxcsr(struct task_struct *tsk) extern void fpstate_cache_init(void); extern int fpstate_alloc(struct fpu *fpu); +extern void fpstate_free(struct fpu *fpu); extern int fpu__copy(struct task_struct *dst, struct task_struct *src); -static inline void fpstate_free(struct fpu *fpu) -{ - if (fpu->state) { - kmem_cache_free(task_xstate_cachep, fpu->state); - fpu->state = NULL; - } -} - static inline void fpu_copy(struct task_struct *dst, struct task_struct *src) { if (use_eager_fpu()) { diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 05df212449ed..b00d1b3c5811 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -178,6 +178,15 @@ int fpstate_alloc(struct fpu *fpu) } EXPORT_SYMBOL_GPL(fpstate_alloc); +void fpstate_free(struct fpu *fpu) +{ + if (fpu->state) { + kmem_cache_free(task_xstate_cachep, fpu->state); + fpu->state = NULL; + } +} +EXPORT_SYMBOL_GPL(fpstate_free); + int fpu__copy(struct task_struct *dst, struct task_struct *src) { dst->thread.fpu.counter = 0; -- 2.34.1