Skip to content

Commit 78a0815

Browse files
amlutoZhengShunQian
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 <[email protected]> Signed-off-by: Rik van Riel <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dave Hansen <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Quentin Casasnovas <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 01dbc71 commit 78a0815

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

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)