summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2012-07-25 15:28:19 (GMT)
committerH. Peter Anvin <hpa@zytor.com>2012-07-25 15:35:38 (GMT)
commitd6250a3f12edb3a86db9598ffeca3de8b4a219e9 (patch)
treeb60e263b2c30459fcf2fdbe6be29b52d242e70a4 /arch/x86
parent2a8ac745e3171889d364235b8203342e28526d2c (diff)
downloadlinux-fsl-qoriq-d6250a3f12edb3a86db9598ffeca3de8b4a219e9.tar.xz
x86, nops: Missing break resulting in incorrect selection on Intel
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> Cc: <stable@vger.kernel.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/alternative.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 1f84794..73ef56c 100644
--- 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;