From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933627AbbEEQtk (ORCPT ); Tue, 5 May 2015 12:49:40 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:32924 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761121AbbEEQ3Z (ORCPT ); Tue, 5 May 2015 12:29:25 -0400 From: Ingo Molnar To: linux-kernel@vger.kernel.org Cc: Andy Lutomirski , Borislav Petkov , Dave Hansen , Fenghua Yu , "H. Peter Anvin" , Linus Torvalds , Oleg Nesterov , Thomas Gleixner Subject: [PATCH 063/208] x86/fpu: Use 'struct fpu' in __fpu_save() Date: Tue, 5 May 2015 18:24:43 +0200 Message-Id: <1430843228-13749-64-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430843228-13749-1-git-send-email-mingo@kernel.org> References: <1430843228-13749-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Migrate this function to pure 'struct fpu' usage. Reviewed-by: Borislav Petkov Cc: Andy Lutomirski Cc: Dave Hansen Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Thomas Gleixner Signed-off-by: Ingo Molnar --- arch/x86/kernel/fpu/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index 93bf90d48ded..1ed2fc695e54 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -125,15 +125,15 @@ void __kernel_fpu_end(void) } EXPORT_SYMBOL(__kernel_fpu_end); -static void __save_fpu(struct task_struct *tsk) +static void __save_fpu(struct fpu *fpu) { if (use_xsave()) { if (unlikely(system_state == SYSTEM_BOOTING)) - xsave_state_booting(&tsk->thread.fpu.state->xsave); + xsave_state_booting(&fpu->state->xsave); else - xsave_state(&tsk->thread.fpu.state->xsave); + xsave_state(&fpu->state->xsave); } else { - fpu_fxsave(&tsk->thread.fpu); + fpu_fxsave(fpu); } } @@ -151,7 +151,7 @@ void fpu__save(struct task_struct *tsk) preempt_disable(); if (fpu->has_fpu) { if (use_eager_fpu()) { - __save_fpu(tsk); + __save_fpu(fpu); } else { fpu_save_init(fpu); __thread_fpu_end(fpu); @@ -231,17 +231,17 @@ EXPORT_SYMBOL_GPL(fpstate_free); */ static void fpu_copy(struct task_struct *dst, struct task_struct *src) { + struct fpu *dst_fpu = &dst->thread.fpu; + struct fpu *src_fpu = &src->thread.fpu; + WARN_ON(src != current); if (use_eager_fpu()) { memset(&dst->thread.fpu.state->xsave, 0, xstate_size); - __save_fpu(dst); + __save_fpu(dst_fpu); } else { - struct fpu *dfpu = &dst->thread.fpu; - struct fpu *sfpu = &src->thread.fpu; - fpu__save(src); - memcpy(dfpu->state, sfpu->state, xstate_size); + memcpy(dst_fpu->state, src_fpu->state, xstate_size); } } -- 2.1.0