diff options
| author | Roel Kluin <roel.kluin@gmail.com> | 2009-08-25 15:35:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-24 08:44:00 -0700 |
| commit | 2d75a4795020ccdfaae36c4ecb004d8c0fc35708 (patch) | |
| tree | a5addcd87387887cdd5ea52b22befe31a7b5d95c /arch | |
| parent | 4da07ab56e64e4b022e03b1a9b602d68e390cf1a (diff) | |
| download | lwn-2d75a4795020ccdfaae36c4ecb004d8c0fc35708.tar.gz lwn-2d75a4795020ccdfaae36c4ecb004d8c0fc35708.zip | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/kernel/apic/es7000_32.c | 2 |
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 8952a5890281..89174f847b49 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; |