diff options
| author |   Yinghai Lu <yhlu.kernel@gmail.com> | 2008-09-04 20:09:12 -0700 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:40:55 +0200 |
| commit | b89d3b3e2caeab3d895301d1aee3cd2a91eddb79 (patch) | |
| tree | 90142c95160dd8593a6931501c50a78d9480acd1 /arch/x86/kernel/cpu/common.c | |
| parent | x86: cpu/common*.c: merge print_cpu_info() (diff) | |
| download | linux-dev-b89d3b3e2caeab3d895301d1aee3cd2a91eddb79.tar.xz linux-dev-b89d3b3e2caeab3d895301d1aee3cd2a91eddb79.zip | |
x86: cpu/common*.c, merge generic_identify()
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 61a70748213e..f35baa7f3036 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -548,6 +548,10 @@ void __init early_cpu_init(void) * of early VIA chips and (more importantly) broken virtualizers that * are not easy to detect. Hence, probe for it based on first * principles. + * + * Note: no 64-bit chip is known to lack these, but put the code here + * for consistency with 32 bits, and to make it utterly trivial to + * diagnose the problem should it ever surface. */ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c) { @@ -586,11 +590,16 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) if (c->cpuid_level >= 0x00000001) { c->initial_apicid = (cpuid_ebx(1) >> 24) & 0xFF; -#ifdef CONFIG_X86_HT +#ifdef CONFIG_X86_32 +# ifdef CONFIG_X86_HT c->apicid = phys_pkg_id(c->initial_apicid, 0); - c->phys_proc_id = c->initial_apicid; -#else +# else c->apicid = c->initial_apicid; +# endif +#endif + +#ifdef CONFIG_X86_HT + c->phys_proc_id = c->initial_apicid; #endif } |