From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 13 Jun 2018 20:37:19 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v4.17.2~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed9577c3efb26cc1f8ff5df3b0f768867e0041d5;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	x86-crypto-x86-fpu-remove-x86_feature_eager_fpu-ifdef-from-the-crc32c-code.patch
---

diff --git a/queue-4.4/series b/queue-4.4/series
index ea400133225..b685510370f 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -11,3 +11,4 @@ x86-fpu-hard-disable-lazy-fpu-mode.patch
 x86-fpu-fix-fnsave-usage-in-eagerfpu-mode.patch
 x86-fpu-fix-math-emulation-in-eager-fpu-mode.patch
 af_key-always-verify-length-of-provided-sadb_key.patch
+x86-crypto-x86-fpu-remove-x86_feature_eager_fpu-ifdef-from-the-crc32c-code.patch
diff --git a/queue-4.4/x86-crypto-x86-fpu-remove-x86_feature_eager_fpu-ifdef-from-the-crc32c-code.patch b/queue-4.4/x86-crypto-x86-fpu-remove-x86_feature_eager_fpu-ifdef-from-the-crc32c-code.patch
new file mode 100644
index 00000000000..780095ac1b4
--- /dev/null
+++ b/queue-4.4/x86-crypto-x86-fpu-remove-x86_feature_eager_fpu-ifdef-from-the-crc32c-code.patch
@@ -0,0 +1,56 @@
+From 02f39b2379fb81557ae864ec8f85421c0250c954 Mon Sep 17 00:00:00 2001
+From: Andy Lutomirski <luto@kernel.org>
+Date: Tue, 4 Oct 2016 20:34:30 -0400
+Subject: x86/crypto, x86/fpu: Remove X86_FEATURE_EAGER_FPU #ifdef from the crc32c code
+
+From: Andy Lutomirski <luto@kernel.org>
+
+commit 02f39b2379fb81557ae864ec8f85421c0250c954 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>
+
+---
+ arch/x86/crypto/crc32c-intel_glue.c |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- 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)