From 3493250ecfd2bb7a6eaa26c49cf962c58e402f9a Mon Sep 17 00:00:00 2001
From: Andreas Herrmann <andreas.herrmann3@amd.com>
Date: Wed, 30 Jan 2008 13:32:41 +0100
Subject: [PATCH] --- yaml --- r: 80163 b: refs/heads/master c:
 9566e91d494ed0668edf88f852de7f251fe8fe9a h: refs/heads/master i:   80161:
 f176e01e59e22f2724a01e8074ac26b5fc375a35   80159:
 e3355ff995b519ef0a8bbb57096a719c90be36d7 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/kernel/setup_64.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0579e9330493..00ca2310e718 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddb25f9ac1c4b4f9ba0bdacd7850a921a0c6886c
+refs/heads/master: 9566e91d494ed0668edf88f852de7f251fe8fe9a
diff --git a/trunk/arch/x86/kernel/setup_64.c b/trunk/arch/x86/kernel/setup_64.c
index 3cae326093cb..1caf7458dc48 100644
--- a/trunk/arch/x86/kernel/setup_64.c
+++ b/trunk/arch/x86/kernel/setup_64.c
@@ -996,6 +996,10 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
 			c->x86_capability[2] = cpuid_edx(0x80860001);
 	}
 
+	c->extended_cpuid_level = cpuid_eax(0x80000000);
+	if (c->extended_cpuid_level >= 0x80000007)
+		c->x86_power = cpuid_edx(0x80000007);
+
 	switch (c->x86_vendor) {
 	case X86_VENDOR_AMD:
 		early_init_amd(c);
@@ -1066,11 +1070,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 	numa_add_cpu(smp_processor_id());
 #endif
 
-	c->extended_cpuid_level = cpuid_eax(0x80000000);
-
-	if (c->extended_cpuid_level >= 0x80000007)
-		c->x86_power = cpuid_edx(0x80000007);
-
 	switch (c->x86_vendor) {
 	case X86_VENDOR_AMD:
 		early_init_amd(c);