diff options
| author | Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 04:16:24 -0400 |
|---|---|---|
| committer | Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 04:16:24 -0400 |
| commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
| tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /arch/i386/kernel/cpu/common.c | |
| parent | d3870398fafd4911bd84573b78be4b6b762f32b0 (diff) | |
| parent | 4ec5240ec367a592834385893200dd4fb369354c (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/kernel/cpu/common.c')
| -rw-r--r-- | arch/i386/kernel/cpu/common.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c index 6be0310e3cd3..d199e525680a 100644 --- a/arch/i386/kernel/cpu/common.c +++ b/arch/i386/kernel/cpu/common.c | |||
| @@ -243,6 +243,10 @@ static void __init early_cpu_detect(void) | |||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | early_intel_workaround(c); | 245 | early_intel_workaround(c); |
| 246 | |||
| 247 | #ifdef CONFIG_X86_HT | ||
| 248 | phys_proc_id[smp_processor_id()] = (cpuid_ebx(1) >> 24) & 0xff; | ||
| 249 | #endif | ||
| 246 | } | 250 | } |
| 247 | 251 | ||
| 248 | void __init generic_identify(struct cpuinfo_x86 * c) | 252 | void __init generic_identify(struct cpuinfo_x86 * c) |