Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752955AbcJGJoU (ORCPT ); Fri, 7 Oct 2016 05:44:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:33876 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750866AbcJGJoQ (ORCPT ); Fri, 7 Oct 2016 05:44:16 -0400 Date: Fri, 7 Oct 2016 02:43:07 -0700 From: tip-bot for Andy Lutomirski Message-ID: Cc: fenghua.yu@intel.com, jpoimboe@redhat.com, dvlasenk@redhat.com, brgerst@gmail.com, dave.hansen@linux.intel.com, peterz@infradead.org, riel@redhat.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, quentin.casasnovas@oracle.com, oleg@redhat.com, linux-kernel@vger.kernel.org, luto@kernel.org, bp@alien8.de, torvalds@linux-foundation.org Reply-To: bp@alien8.de, torvalds@linux-foundation.org, oleg@redhat.com, linux-kernel@vger.kernel.org, luto@kernel.org, hpa@zytor.com, tglx@linutronix.de, quentin.casasnovas@oracle.com, brgerst@gmail.com, peterz@infradead.org, dave.hansen@linux.intel.com, riel@redhat.com, mingo@kernel.org, fenghua.yu@intel.com, jpoimboe@redhat.com, dvlasenk@redhat.com In-Reply-To: <1475627678-20788-2-git-send-email-riel@redhat.com> References: <1475627678-20788-2-git-send-email-riel@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/fpu] x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code Git-Commit-ID: 02f39b2379fb81557ae864ec8f85421c0250c954 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: 2214 Lines: 56 Commit-ID: 02f39b2379fb81557ae864ec8f85421c0250c954 Gitweb: http://git.kernel.org/tip/02f39b2379fb81557ae864ec8f85421c0250c954 Author: Andy Lutomirski AuthorDate: Tue, 4 Oct 2016 20:34:30 -0400 Committer: Ingo Molnar CommitDate: Fri, 7 Oct 2016 11:14:06 +0200 x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code The crypto code was checking both use_eager_fpu() and defined(X86_FEATURE_EAGER_FPU). The latter was nonsensical, so remove it. This will avoid breakage when we remove X86_FEATURE_EAGER_FPU. Signed-off-by: Andy Lutomirski Signed-off-by: Rik van Riel 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-2-git-send-email-riel@redhat.com Signed-off-by: Ingo Molnar --- arch/x86/crypto/crc32c-intel_glue.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/x86/crypto/crc32c-intel_glue.c b/arch/x86/crypto/crc32c-intel_glue.c index 0857b1a..715399b 100644 --- a/arch/x86/crypto/crc32c-intel_glue.c +++ b/arch/x86/crypto/crc32c-intel_glue.c @@ -58,16 +58,11 @@ asmlinkage unsigned int crc_pcl(const u8 *buffer, int len, unsigned int crc_init); static int crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_EAGERFPU; -#if defined(X86_FEATURE_EAGER_FPU) #define set_pcl_breakeven_point() \ do { \ if (!use_eager_fpu()) \ crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU; \ } while (0) -#else -#define set_pcl_breakeven_point() \ - (crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU) -#endif #endif /* CONFIG_X86_64 */ static u32 crc32c_intel_le_hw_byte(u32 crc, unsigned char const *data, size_t length)