aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-08-25 15:35:12 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-24 08:27:20 -0700
commit06849e6aac573df704bcb4889d4696cac6ecf8cd (patch)
tree23b024a420d5c0b09c41a7e8d9a542bb8c155494
parent852a95da5412bb513bf83ad1daa39992fa72b81e (diff)
downloadlinux-linaro-stable-06849e6aac573df704bcb4889d4696cac6ecf8cd.tar.gz
x86: Fix x86_model test in es7000_apic_is_cluster()
commit 005155b1f626d2b2d7932e4afdf4fead168c6888 upstream. 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> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--arch/x86/kernel/apic/es7000_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic/es7000_32.c b/arch/x86/kernel/apic/es7000_32.c
index 302947775575..8f2db11f8b79 100644
--- 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;