aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/common_64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/cpu/common_64.c')
-rw-r--r--arch/x86/kernel/cpu/common_64.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common_64.c b/arch/x86/kernel/cpu/common_64.c
index 68b06a39dcac..869a6ff9f7dc 100644
--- a/arch/x86/kernel/cpu/common_64.c
+++ b/arch/x86/kernel/cpu/common_64.c
@@ -581,6 +581,9 @@ static void __cpuinit detect_nopl(struct cpuinfo_x86 *c)
581 581
582static void __cpuinit generic_identify(struct cpuinfo_x86 *c) 582static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
583{ 583{
584 if (!have_cpuid_p())
585 return;
586
584 c->extended_cpuid_level = 0; 587 c->extended_cpuid_level = 0;
585 588
586 cpu_detect(c); 589 cpu_detect(c);
@@ -589,11 +592,21 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
589 592
590 get_cpu_cap(c); 593 get_cpu_cap(c);
591 594
592 c->initial_apicid = (cpuid_ebx(1) >> 24) & 0xff; 595 if (c->cpuid_level >= 0x00000001) {
593#ifdef CONFIG_SMP 596 c->initial_apicid = (cpuid_ebx(1) >> 24) & 0xFF;
594 c->phys_proc_id = c->initial_apicid; 597#ifdef CONFIG_X86_32
598# ifdef CONFIG_X86_HT
599 c->apicid = phys_pkg_id(c->initial_apicid, 0);
600# else
601 c->apicid = c->initial_apicid;
602# endif
595#endif 603#endif
596 604
605#ifdef CONFIG_X86_HT
606 c->phys_proc_id = c->initial_apicid;
607#endif
608 }
609
597 if (c->extended_cpuid_level >= 0x80000004) 610 if (c->extended_cpuid_level >= 0x80000004)
598 get_model_name(c); /* Default name */ 611 get_model_name(c); /* Default name */
599 612