projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b7f42ab
)
x86: Fix x86_model test in es7000_apic_is_cluster()
author
Roel Kluin
<roel.kluin@gmail.com>
Tue, 25 Aug 2009 13:35:12 +0000
(15:35 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 25 Aug 2009 13:58:12 +0000
(15:58 +0200)
For the x86_model to be greater than 6 or less than 12 is
logically always true.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: <stable@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/apic/es7000_32.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/apic/es7000_32.c
b/arch/x86/kernel/apic/es7000_32.c
index 69328ac8de9c86e106d30af1337a80ab0d4488b1..420f95da7bf6e4a931a30e7556e5243fa2ea0013 100644
(file)
--- a/
arch/x86/kernel/apic/es7000_32.c
+++ b/
arch/x86/kernel/apic/es7000_32.c
@@
-167,7
+167,7
@@
static int es7000_apic_is_cluster(void)
{
/* MPENTIUMIII */
if (boot_cpu_data.x86 == 6 &&
- (boot_cpu_data.x86_model >= 7
||
boot_cpu_data.x86_model <= 11))
+ (boot_cpu_data.x86_model >= 7
&&
boot_cpu_data.x86_model <= 11))
return 1;
return 0;