Skip to content

Commit 077c9e2

Browse files
amlutogregkh
authored andcommitted
x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code
commit 02f39b2 upstream. 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 <luto@kernel.org> Signed-off-by: Rik van Riel <riel@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: pbonzini@redhat.com Link: http://lkml.kernel.org/r/1475627678-20788-2-git-send-email-riel@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 142b79a commit 077c9e2

1 file changed

Lines changed: 0 additions & 5 deletions

File tree

arch/x86/crypto/crc32c-intel_glue.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,11 @@
5858
asmlinkage unsigned int crc_pcl(const u8 *buffer, int len,
5959
unsigned int crc_init);
6060
static int crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_EAGERFPU;
61-
#if defined(X86_FEATURE_EAGER_FPU)
6261
#define set_pcl_breakeven_point() \
6362
do { \
6463
if (!use_eager_fpu()) \
6564
crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU; \
6665
} while (0)
67-
#else
68-
#define set_pcl_breakeven_point() \
69-
(crc32c_pcl_breakeven = CRC32C_PCL_BREAKEVEN_NOEAGERFPU)
70-
#endif
7166
#endif /* CONFIG_X86_64 */
7267

7368
static u32 crc32c_intel_le_hw_byte(u32 crc, unsigned char const *data, size_t length)

0 commit comments

Comments
 (0)