projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61e0a9e
)
x86, nops: Missing break resulting in incorrect selection on Intel
author
Alan Cox
<alan@linux.intel.com>
Wed, 25 Jul 2012 15:28:19 +0000
(16:28 +0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 15 Aug 2012 19:04:11 +0000
(12:04 -0700)
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
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/alternative.c
b/arch/x86/kernel/alternative.c
index
a81f2d5
..
dfabea4
100644
(file)
--- 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;