---

yaml --- r: 88751 b: refs/heads/master c: a706221 h: refs/heads/master i: 88749: 092360b 88747: a105061 88743: 9c8ed22 88735: ee3c336 v: v3
git-mirror · Apr 17, 2008 · 81c069b · 81c069b
1 parent 90547ed
commit 81c069b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97b44ae6cd8117212d41bedc433b5571ee3b79d9
+refs/heads/master: a7062211865efb53cda253d6e33a106f0fe20ebe
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
@@ -564,7 +564,7 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)
 	/* Low order bits define the core id (index of core in socket) */
 	c->cpu_core_id = c->phys_proc_id & ((1 << bits)-1);
 	/* Convert the APIC ID into the socket ID */
-	c->phys_proc_id = phys_pkg_id(bits);
+	c->phys_proc_id = (c->apicid - boot_cpu_id) >> bits;
 
 #ifdef CONFIG_NUMA
 	node = c->phys_proc_id;
@@ -581,7 +581,7 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c)
 		   If that doesn't result in a usable node fall back to the
 		   path for the previous case.  */
 
-		int ht_nodeid = apicid - (cpu_data(0).phys_proc_id << bits);
+		int ht_nodeid = apicid - boot_cpu_id;
 
 		if (ht_nodeid >= 0 &&
 		    apicid_to_node[ht_nodeid] != NUMA_NO_NODE)