commit 2942283e970b357c146ebdcbbcc0bdf5048615ff
author Andi Kleen <ak@suse.de> Mon May 16 21:53:26 2005 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> Tue May 17 07:59:14 2005 -0700
tree 44f6f599f93f85a8bdb550fc7f74838e1d4fd2fd
parent dda50e716dc9451f40eebfb2902c260e4f62cf34

[PATCH] x86_64: Remove x86_apicid field

Remove x86_apicid field

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/x86_64/kernel/setup.c

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index aab249a..966dfc7 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -727,7 +727,7 @@
 static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 {
 #ifdef CONFIG_SMP
-	int cpu = c->x86_apicid;
+	int cpu = smp_processor_id();
 	int node = 0;
 	if (c->x86_num_cores == 1)
 		return;
@@ -929,7 +929,6 @@
 	c->x86_clflush_size = 64;
 	c->x86_cache_alignment = c->x86_clflush_size;
 	c->x86_num_cores = 1;
-	c->x86_apicid = c == &boot_cpu_data ? 0 : c - cpu_data;
 	c->extended_cpuid_level = 0;
 	memset(&c->x86_capability, 0, sizeof c->x86_capability);
 
@@ -958,7 +957,6 @@
 		} 
 		if (c->x86_capability[0] & (1<<19)) 
 			c->x86_clflush_size = ((misc >> 8) & 0xff) * 8;
-		c->x86_apicid = misc >> 24;
 	} else {
 		/* Have CPUID level 0 only - unheard of */
 		c->x86 = 4;