From 3ac97ff8bd669eadc105c5630c1d73f3d0ff729b Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Mon, 16 May 2005 21:53:26 -0700
Subject: [PATCH] --- yaml --- r: 1143 b: refs/heads/master c:
 2942283e970b357c146ebdcbbcc0bdf5048615ff h: refs/heads/master i:   1141:
 57d801c8412d3fae28eb6dcb46fe4393269d5694   1139:
 e5ffad62d21b2e0d70851f89de9524e26e2a6f22   1135:
 ac8d5297650c2daf110a70f34c1b0415363bac4d v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86_64/kernel/setup.c     | 4 +---
 trunk/include/asm-x86_64/processor.h | 1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 0d9bea93cfd4..13bdf96f498c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dda50e716dc9451f40eebfb2902c260e4f62cf34
+refs/heads/master: 2942283e970b357c146ebdcbbcc0bdf5048615ff
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index aab249a57464..966dfc768cba 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -727,7 +727,7 @@ static void __init display_cacheinfo(struct cpuinfo_x86 *c)
 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 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c)
 	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 @@ void __init early_identify_cpu(struct cpuinfo_x86 *c)
 		} 
 		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;
diff --git a/trunk/include/asm-x86_64/processor.h b/trunk/include/asm-x86_64/processor.h
index 9f74a286ef11..d641b19f6da5 100644
--- a/trunk/include/asm-x86_64/processor.h
+++ b/trunk/include/asm-x86_64/processor.h
@@ -62,7 +62,6 @@ struct cpuinfo_x86 {
 	int	x86_tlbsize;	/* number of 4K pages in DTLB/ITLB combined(in pages)*/
         __u8    x86_virt_bits, x86_phys_bits;
 	__u8	x86_num_cores;
-	__u8	x86_apicid;
         __u32   x86_power; 	
 	__u32   extended_cpuid_level;	/* Max extended CPUID function supported */
 	unsigned long loops_per_jiffy;