From: Alan Cox <alan@linux.intel.com>
Date: Wed, 25 Jul 2012 15:28:19 +0000 (+0100)
Subject: x86, nops: Missing break resulting in incorrect selection on Intel
X-Git-Tag: firefly_0821_release~7541^2~826
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7b1cad628030b9bbdaaa4bb8ff73cabaab6e82c9;p=firefly-linux-kernel-4.4.55.git

x86, nops: Missing break resulting in incorrect selection on Intel

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>
---

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index a81f2d52f869..dfabea4de417 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -220,7 +220,7 @@ void __init arch_init_ideal_nops(void)
 			ideal_nops = intel_nops;
 #endif
 		}
-
+		break;
 	default:
 #ifdef CONFIG_X86_64
 		ideal_nops = k8_nops;