From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 9 Aug 2012 18:30:52 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.5.2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0739ce2541045066a370b4eb5191241bcf35865;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	x86-nops-missing-break-resulting-in-incorrect-selection-on-intel.patch
---

diff --git a/queue-3.4/series b/queue-3.4/series
index 76f1b7175d8..cee412cdd0a 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -26,3 +26,4 @@ acpi-processor-fix-tick_broadcast_mask-online-offline-regression.patch
 mac80211-cancel-mesh-path-timer.patch
 ath9k-add-pid-vid-support-for-ar1111.patch
 wireless-reg-restore-previous-behaviour-of-chan-max_power-calculations.patch
+x86-nops-missing-break-resulting-in-incorrect-selection-on-intel.patch
diff --git a/queue-3.4/x86-nops-missing-break-resulting-in-incorrect-selection-on-intel.patch b/queue-3.4/x86-nops-missing-break-resulting-in-incorrect-selection-on-intel.patch
new file mode 100644
index 00000000000..80a6adddcf2
--- /dev/null
+++ b/queue-3.4/x86-nops-missing-break-resulting-in-incorrect-selection-on-intel.patch
@@ -0,0 +1,33 @@
+From d6250a3f12edb3a86db9598ffeca3de8b4a219e9 Mon Sep 17 00:00:00 2001
+From: Alan Cox <alan@linux.intel.com>
+Date: Wed, 25 Jul 2012 16:28:19 +0100
+Subject: x86, nops: Missing break resulting in incorrect selection on Intel
+
+From: Alan Cox <alan@linux.intel.com>
+
+commit d6250a3f12edb3a86db9598ffeca3de8b4a219e9 upstream.
+
+The Intel case falls through into the generic case which then changes
+the values.  For cases like the P6 it doesn't do the right thing so
+this seems to be a screwup.
+
+Signed-off-by: Alan Cox <alan@linux.intel.com>
+Link: http://lkml.kernel.org/n/tip-lww2uirad4skzjlmrm0vru8o@git.kernel.org
+Signed-off-by: H. Peter Anvin <hpa@zytor.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/x86/kernel/alternative.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/alternative.c
++++ b/arch/x86/kernel/alternative.c
+@@ -219,7 +219,7 @@ void __init arch_init_ideal_nops(void)
+ 			ideal_nops = intel_nops;
+ #endif
+ 		}
+-
++		break;
+ 	default:
+ #ifdef CONFIG_X86_64
+ 		ideal_nops = k8_nops;