aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/setup_64.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 3cae326093cb..1caf7458dc48 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -996,6 +996,10 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
996 c->x86_capability[2] = cpuid_edx(0x80860001); 996 c->x86_capability[2] = cpuid_edx(0x80860001);
997 } 997 }
998 998
999 c->extended_cpuid_level = cpuid_eax(0x80000000);
1000 if (c->extended_cpuid_level >= 0x80000007)
1001 c->x86_power = cpuid_edx(0x80000007);
1002
999 switch (c->x86_vendor) { 1003 switch (c->x86_vendor) {
1000 case X86_VENDOR_AMD: 1004 case X86_VENDOR_AMD:
1001 early_init_amd(c); 1005 early_init_amd(c);
@@ -1066,11 +1070,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
1066 numa_add_cpu(smp_processor_id()); 1070 numa_add_cpu(smp_processor_id());
1067#endif 1071#endif
1068 1072
1069 c->extended_cpuid_level = cpuid_eax(0x80000000);
1070
1071 if (c->extended_cpuid_level >= 0x80000007)
1072 c->x86_power = cpuid_edx(0x80000007);
1073
1074 switch (c->x86_vendor) { 1073 switch (c->x86_vendor) {
1075 case X86_VENDOR_AMD: 1074 case X86_VENDOR_AMD:
1076 early_init_amd(c); 1075 early_init_amd(c);