| From 005155b1f626d2b2d7932e4afdf4fead168c6888 Mon Sep 17 00:00:00 2001 |
| From: Roel Kluin <roel.kluin@gmail.com> |
| Date: Tue, 25 Aug 2009 15:35:12 +0200 |
| Subject: x86: Fix x86_model test in es7000_apic_is_cluster() |
| |
| From: Roel Kluin <roel.kluin@gmail.com> |
| |
| 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> |
| |
| --- |
| arch/x86/kernel/apic/es7000_32.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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; |
