From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 12 Sep 2013 02:17:38 +0000 (-0700)
Subject: 3.11-stable patches
X-Git-Tag: v3.0.96~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1644a179254c72b79185274402164568d166436;p=thirdparty%2Fkernel%2Fstable-queue.git

3.11-stable patches

added patches:
	crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch
---

diff --git a/queue-3.11/crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch b/queue-3.11/crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch
new file mode 100644
index 00000000000..e195963bd6e
--- /dev/null
+++ b/queue-3.11/crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch
@@ -0,0 +1,39 @@
+From edb6f29464afc65fc73767540b854abf63ae7144 Mon Sep 17 00:00:00 2001
+From: John Haxby <john.haxby@oracle.com>
+Date: Wed, 14 Aug 2013 16:23:18 +0100
+Subject: crypto: xor - Check for osxsave as well as avx in crypto/xor
+
+From: John Haxby <john.haxby@oracle.com>
+
+commit edb6f29464afc65fc73767540b854abf63ae7144 upstream.
+
+This affects xen pv guests with sufficiently old versions of xen and
+sufficiently new hardware.  On such a system, a guest with a btrfs
+root won't even boot.
+
+Signed-off-by: John Haxby <john.haxby@oracle.com>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Reported-by: Michael Marineau <michael.marineau@coreos.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/include/asm/xor_avx.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/include/asm/xor_avx.h
++++ b/arch/x86/include/asm/xor_avx.h
+@@ -167,12 +167,12 @@ static struct xor_block_template xor_blo
+ 
+ #define AVX_XOR_SPEED \
+ do { \
+-	if (cpu_has_avx) \
++	if (cpu_has_avx && cpu_has_osxsave) \
+ 		xor_speed(&xor_block_avx); \
+ } while (0)
+ 
+ #define AVX_SELECT(FASTEST) \
+-	(cpu_has_avx ? &xor_block_avx : FASTEST)
++	(cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST)
+ 
+ #else
+ 
diff --git a/queue-3.11/series b/queue-3.11/series
index 6b61c54cfbb..1751f4be7d7 100644
--- a/queue-3.11/series
+++ b/queue-3.11/series
@@ -11,3 +11,4 @@ acpi-ec-add-asustek-l4r-to-quirk-list-in-order-to-validate-ecdt.patch
 drivers-misc-hpilo-correct-panic-when-an-aux-ilo-is-detected.patch
 asoc-fsl-fix-module-build.patch
 imx-drm-imx-drm-core-export-imx_drm_encoder_get_mux_id.patch
+crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch