---

yaml --- r: 30487 b: refs/heads/master c: 2bbc419 h: refs/heads/master i: 30485: cfe0d21 30483: c1a5817 30479: e5eb590 v: v3
git-mirror · Jun 26, 2006 · 1b47bde · 1b47bde
1 parent 265042e
commit 1b47bde
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git 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
@@ -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);