Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031632AbbEERyB (ORCPT ); Tue, 5 May 2015 13:54:01 -0400 Received: from mail-wi0-f170.google.com ([209.85.212.170]:34201 "EHLO mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030821AbbEERxz (ORCPT ); Tue, 5 May 2015 13:53:55 -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 144/208] x86/fpu: Eliminate __save_fpu() Date: Tue, 5 May 2015 19:50:36 +0200 Message-Id: <1430848300-27877-66-git-send-email-mingo@kernel.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1430848300-27877-1-git-send-email-mingo@kernel.org> References: <1430848300-27877-1-git-send-email-mingo@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2261 Lines: 77 The current implementation of __save_fpu(): if (use_xsave()) { xsave_state(&fpu->state.xsave); } else { fpu_fxsave(fpu); } Is actually a simplified version of copy_fpregs_to_fpstate(), if use_eager_fpu() is true. But all call sites of __save_fpu() call it only it when use_eager_fpu() is true. So we can eliminate __save_fpu() altogether and use the standard copy_fpregs_to_fpstate() function. This cleans up the code by making it use fewer variants of FPU register saving. 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 | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/fpu/core.c b/arch/x86/kernel/fpu/core.c index a0e2b65745da..478e002ab122 100644 --- a/arch/x86/kernel/fpu/core.c +++ b/arch/x86/kernel/fpu/core.c @@ -169,15 +169,6 @@ void irq_ts_restore(int TS_state) } EXPORT_SYMBOL_GPL(irq_ts_restore); -static void __save_fpu(struct fpu *fpu) -{ - if (use_xsave()) { - xsave_state(&fpu->state.xsave); - } else { - fpu_fxsave(fpu); - } -} - /* * Save the FPU state (initialize it if necessary): * @@ -190,7 +181,7 @@ void fpu__save(struct fpu *fpu) preempt_disable(); if (fpu->fpregs_active) { if (use_eager_fpu()) { - __save_fpu(fpu); + copy_fpregs_to_fpstate(fpu); } else { copy_fpregs_to_fpstate(fpu); fpregs_deactivate(fpu); @@ -235,7 +226,7 @@ static void fpu_copy(struct fpu *dst_fpu, struct fpu *src_fpu) if (use_eager_fpu()) { memset(&dst_fpu->state.xsave, 0, xstate_size); - __save_fpu(dst_fpu); + copy_fpregs_to_fpstate(dst_fpu); } else { fpu__save(src_fpu); memcpy(&dst_fpu->state, &src_fpu->state, xstate_size); -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/