From f828c07d6eb1fd2f5e5e3481a215f9e1e09e41a2 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sun, 20 Nov 2005 18:49:05 +0100 Subject: [PATCH] --- yaml --- r: 14555 b: refs/heads/master c: d7169160bb772efe6510d8bc0c8e7625efbcc0b3 h: refs/heads/master i: 14553: 9eca1346b903723f3725e3c5b612a1af849fb60e 14551: 5fd25278a773ee5ef3a7c18285c6df51937200ff v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/mpparse.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 54ed016ff9a7..f97a8e7c9cd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 252ec9e28f0cf350e246c065ffe70a2e32b84ad4 +refs/heads/master: d7169160bb772efe6510d8bc0c8e7625efbcc0b3 diff --git a/trunk/arch/i386/kernel/mpparse.c b/trunk/arch/i386/kernel/mpparse.c index 8f767d9aa45d..1ca5269b1e86 100644 --- a/trunk/arch/i386/kernel/mpparse.c +++ b/trunk/arch/i386/kernel/mpparse.c @@ -220,8 +220,9 @@ static void __devinit MP_processor_info (struct mpc_config_processor *m) num_processors++; if ((num_processors > 8) && - APIC_XAPIC(ver) && - (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) + ((APIC_XAPIC(ver) && + (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)) || + (boot_cpu_data.x86_vendor == X86_VENDOR_AMD))) def_to_bigsmp = 1; else def_to_bigsmp = 0;