From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 8 Dec 2013 20:18:57 +0000 (-0800)
Subject: 3.12-stable patches
X-Git-Tag: v3.4.74~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=df5c69beaeb7ff268a390e1ee0bfffec5789c5c4;p=thirdparty%2Fkernel%2Fstable-queue.git

3.12-stable patches

added patches:
	x86-64-build-always-pass-in-mno-sse.patch
---

diff --git a/queue-3.12/series b/queue-3.12/series
index 7eafde951a6..1e3dcb5c810 100644
--- a/queue-3.12/series
+++ b/queue-3.12/series
@@ -46,3 +46,4 @@ cpufreq-fix-garbage-kobjects-on-errors-during-suspend-resume.patch
 update-of-blkg_stat-and-blkg_rwstat-may-happen-in-bh-context.patch
 irq-enable-all-irqs-unconditionally-in-irq_resume.patch
 net-update-consumers-of-msg_more-to-recognize-msg_sendpage_notlast.patch
+x86-64-build-always-pass-in-mno-sse.patch
diff --git a/queue-3.12/x86-64-build-always-pass-in-mno-sse.patch b/queue-3.12/x86-64-build-always-pass-in-mno-sse.patch
new file mode 100644
index 00000000000..f8d369158c8
--- /dev/null
+++ b/queue-3.12/x86-64-build-always-pass-in-mno-sse.patch
@@ -0,0 +1,52 @@
+From 5551a34e5aeab868f8d37f70d8754868921b4ee5 Mon Sep 17 00:00:00 2001
+From: "H. Peter Anvin" <hpa@linux.intel.com>
+Date: Wed, 20 Nov 2013 13:31:49 -0800
+Subject: x86-64, build: Always pass in -mno-sse
+
+From: "H. Peter Anvin" <hpa@linux.intel.com>
+
+commit 5551a34e5aeab868f8d37f70d8754868921b4ee5 upstream.
+
+Always pass in the -mno-sse argument, regardless if
+-preferred-stack-boundary is supported.  We never want to generate SSE
+instructions in the kernel unless we *really* know what we're doing.
+
+According to H. J. Lu, any version of gcc new enough that we support
+it at all should handle the -mno-sse option, so just add it
+unconditionally.
+
+Reported-by: Kevin B. Smith <kevin.b.smith@intel.com>
+Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+Cc: H. J. Lu <hjl.tools@gmail.com>
+Link: http://lkml.kernel.org/n/tip-j21wzqv790q834n7yc6g80j1@git.kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/Makefile |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/Makefile
++++ b/arch/x86/Makefile
+@@ -31,6 +31,9 @@ ifeq ($(CONFIG_X86_32),y)
+ 
+         KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return
+ 
++        # Don't autogenerate SSE instructions
++	KBUILD_CFLAGS += -mno-sse
++
+         # Never want PIC in a 32-bit kernel, prevent breakage with GCC built
+         # with nonstandard options
+         KBUILD_CFLAGS += -fno-pic
+@@ -57,8 +60,11 @@ else
+         KBUILD_AFLAGS += -m64
+         KBUILD_CFLAGS += -m64
+ 
++        # Don't autogenerate SSE instructions
++	KBUILD_CFLAGS += -mno-sse
++
+ 	# Use -mpreferred-stack-boundary=3 if supported.
+-	KBUILD_CFLAGS += $(call cc-option,-mno-sse -mpreferred-stack-boundary=3)
++	KBUILD_CFLAGS += $(call cc-option,-mpreferred-stack-boundary=3)
+ 
+         # FIXME - should be integrated in Makefile.cpu (Makefile_32.cpu)
+         cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)