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

3.10-stable patches

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

diff --git a/queue-3.10/crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch b/queue-3.10/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.10/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.10/series b/queue-3.10/series
index d2d691fa6f4..3ebad398f75 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -40,3 +40,4 @@ vhost_net-poll-vhost-queue-after-marking-dma-is-done.patch
 ipv6-fix-null-pointer-dereference-in-__ip6addrlbl_add.patch
 net-ipv6-tcp-fix-potential-use-after-free-in-tcp_v6_do_rcv.patch
 net-mvneta-properly-disable-hw-phy-polling-and-ensure-adjust_link-works.patch
+crypto-xor-check-for-osxsave-as-well-as-avx-in-crypto-xor.patch