Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755336AbcJGJsB (ORCPT ); Fri, 7 Oct 2016 05:48:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:34148 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753148AbcJGJry (ORCPT ); Fri, 7 Oct 2016 05:47:54 -0400 Date: Fri, 7 Oct 2016 02:46:50 -0700 From: tip-bot for Rik van Riel Message-ID: Cc: quentin.casasnovas@oracle.com, torvalds@linux-foundation.org, jpoimboe@redhat.com, dave.hansen@linux.intel.com, mingo@kernel.org, luto@kernel.org, riel@redhat.com, linux-kernel@vger.kernel.org, oleg@redhat.com, fenghua.yu@intel.com, dvlasenk@redhat.com, bp@alien8.de, hpa@zytor.com, peterz@infradead.org, tglx@linutronix.de, brgerst@gmail.com Reply-To: torvalds@linux-foundation.org, quentin.casasnovas@oracle.com, mingo@kernel.org, dave.hansen@linux.intel.com, jpoimboe@redhat.com, luto@kernel.org, riel@redhat.com, linux-kernel@vger.kernel.org, oleg@redhat.com, fenghua.yu@intel.com, dvlasenk@redhat.com, hpa@zytor.com, bp@alien8.de, tglx@linutronix.de, peterz@infradead.org, brgerst@gmail.com In-Reply-To: <1475627678-20788-9-git-send-email-riel@redhat.com> References: <1475627678-20788-9-git-send-email-riel@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/fpu: Remove __fpregs_(de)activate() Git-Commit-ID: 66f314efca3843a8874405ab015e354d041f86dd X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3035 Lines: 91 Commit-ID: 66f314efca3843a8874405ab015e354d041f86dd Gitweb: http://git.kernel.org/tip/66f314efca3843a8874405ab015e354d041f86dd Author: Rik van Riel AuthorDate: Tue, 4 Oct 2016 20:34:37 -0400 Committer: Ingo Molnar CommitDate: Fri, 7 Oct 2016 11:14:42 +0200 x86/fpu: Remove __fpregs_(de)activate() Now that fpregs_activate() and fpregs_deactivate() do nothing except call the double underscored versions of themselves, we can get rid of the double underscore version. Signed-off-by: Rik van Riel Reviewed-by: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dave Hansen Cc: Denys Vlasenko Cc: Fenghua Yu Cc: H. Peter Anvin Cc: Josh Poimboeuf Cc: Linus Torvalds Cc: Oleg Nesterov Cc: Peter Zijlstra Cc: Quentin Casasnovas Cc: Thomas Gleixner Cc: pbonzini@redhat.com Link: http://lkml.kernel.org/r/1475627678-20788-9-git-send-email-riel@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/include/asm/fpu/internal.h | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/x86/include/asm/fpu/internal.h b/arch/x86/include/asm/fpu/internal.h index d2cfe16..d0324bc 100644 --- a/arch/x86/include/asm/fpu/internal.h +++ b/arch/x86/include/asm/fpu/internal.h @@ -509,8 +509,11 @@ static inline int fpregs_state_valid(struct fpu *fpu, unsigned int cpu) return fpu == this_cpu_read_stable(fpu_fpregs_owner_ctx) && cpu == fpu->last_cpu; } - -static inline void __fpregs_deactivate(struct fpu *fpu) +/* + * These generally need preemption protection to work, + * do try to avoid using these on their own: + */ +static inline void fpregs_deactivate(struct fpu *fpu) { WARN_ON_FPU(!fpu->fpregs_active); @@ -519,7 +522,7 @@ static inline void __fpregs_deactivate(struct fpu *fpu) trace_x86_fpu_regs_deactivated(fpu); } -static inline void __fpregs_activate(struct fpu *fpu) +static inline void fpregs_activate(struct fpu *fpu) { WARN_ON_FPU(fpu->fpregs_active); @@ -544,20 +547,6 @@ static inline int fpregs_active(void) } /* - * These generally need preemption protection to work, - * do try to avoid using these on their own. - */ -static inline void fpregs_activate(struct fpu *fpu) -{ - __fpregs_activate(fpu); -} - -static inline void fpregs_deactivate(struct fpu *fpu) -{ - __fpregs_deactivate(fpu); -} - -/* * FPU state switching for scheduling. * * This is a two-stage process: @@ -595,7 +584,7 @@ switch_fpu_prepare(struct fpu *old_fpu, struct fpu *new_fpu, int cpu) /* Don't change CR0.TS if we just switch! */ if (fpu.preload) { - __fpregs_activate(new_fpu); + fpregs_activate(new_fpu); trace_x86_fpu_regs_activated(new_fpu); prefetch(&new_fpu->state); }