From 5aacbff211050f9403e0c587ead7901a9fe11cd6 Mon Sep 17 00:00:00 2001 From: Ravikiran G Thirumalai Date: Sat, 25 Mar 2006 16:30:04 +0100 Subject: [PATCH] --- yaml --- r: 23811 b: refs/heads/master c: 60c1bc82d9d42486e2b96de668b0b49fadaffd12 h: refs/heads/master i: 23809: 76504310a1b76830fe6be492e0775bd9ecfb24b5 23807: 133761bfd801d126ea8929bfe1ac220d6d32faab v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/setup.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8f78008e2256..a743bb46d63a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e57113bc1ff591005ec0b0fb4885d97c01de73d8 +refs/heads/master: 60c1bc82d9d42486e2b96de668b0b49fadaffd12 diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c index ad3b7fc24a05..49f285871df5 100644 --- a/trunk/arch/x86_64/kernel/setup.c +++ b/trunk/arch/x86_64/kernel/setup.c @@ -846,7 +846,7 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c) unsigned bits; #ifdef CONFIG_NUMA int node = 0; - unsigned apicid = phys_proc_id[cpu]; + unsigned apicid = hard_smp_processor_id(); #endif bits = 0; @@ -856,7 +856,7 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c) /* Low order bits define the core id (index of core in socket) */ cpu_core_id[cpu] = phys_proc_id[cpu] & ((1 << bits)-1); /* Convert the APIC ID into the socket ID */ - phys_proc_id[cpu] >>= bits; + phys_proc_id[cpu] = phys_pkg_id(bits); #ifdef CONFIG_NUMA node = phys_proc_id[cpu];