projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-ingo' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
x86
/
kernel
/
apic
/
es7000_32.c
diff --git
a/arch/x86/kernel/apic/es7000_32.c
b/arch/x86/kernel/apic/es7000_32.c
index 8952a5890281cc363094cc2f67fed1159e6d7674..89174f847b49effb88961e01c6e526f3809ae690 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;