summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2005-05-16 21:53:26 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 07:59:14 -0700
commit2942283e970b357c146ebdcbbcc0bdf5048615ff (patch)
tree44f6f599f93f85a8bdb550fc7f74838e1d4fd2fd
parentdda50e716dc9451f40eebfb2902c260e4f62cf34 (diff)
downloadop-kernel-dev-2942283e970b357c146ebdcbbcc0bdf5048615ff.zip
op-kernel-dev-2942283e970b357c146ebdcbbcc0bdf5048615ff.tar.gz
[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>
-rw-r--r--arch/x86_64/kernel/setup.c4
-rw-r--r--include/asm-x86_64/processor.h1
2 files changed, 1 insertions, 4 deletions
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 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/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h
index 9f74a28..d641b19 100644
--- a/include/asm-x86_64/processor.h
+++ b/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;
OpenPOWER on IntegriCloud