From 1b47bde2ce81c4ecbc7bf93108da99e649f46c9e Mon Sep 17 00:00:00 2001
From: Rohit Seth <rohitseth@google.com>
Date: Mon, 26 Jun 2006 13:58:02 +0200
Subject: [PATCH] --- yaml --- r: 30487 b: refs/heads/master c:
 2bbc419f9d51b44f3fdeea12c5b786bdace82b8e h: refs/heads/master i:   30485:
 cfe0d21b444d44702aa8426af3c8dd4dcdea8f3e   30483:
 c1a58176a97de2a2bce7bd1b75fab423195d4d1a   30479:
 e5eb5904cc1566593dc85f1a2b4199bc5378ef58 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/setup.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3d9faacb19b0..58c623d6a25e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46d13a384bc695ec61458e5dcbac1eee6d623a9b
+refs/heads/master: 2bbc419f9d51b44f3fdeea12c5b786bdace82b8e
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 816203d57e11..a9de8f02671f 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -957,15 +957,12 @@ static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
  */
 static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
 {
-	unsigned int eax;
+	unsigned int eax, t;
 
 	if (c->cpuid_level < 4)
 		return 1;
 
-	__asm__("cpuid"
-		: "=a" (eax)
-		: "0" (4), "c" (0)
-		: "bx", "dx");
+	cpuid_count(4, 0, &eax, &t, &t, &t);
 
 	if (eax & 0x1f)
 		return ((eax >> 26) + 1);