From: Rohit Seth Date: Mon, 26 Jun 2006 11:58:02 +0000 (+0200) Subject: [PATCH] x86_64: Change assembly to use regular cpuid_count macro X-Git-Tag: v2.6.18-rc1~612^2~42 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2bbc419f9d51b44f3fdeea12c5b786bdace82b8e;p=linux-2.6-omap-h63xx.git [PATCH] x86_64: Change assembly to use regular cpuid_count macro Minor cleanup patch: Replacing the asm statement with cpuid_count macro(which already provides the same functionality). Signed-off-by: Rohit Seth Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 816203d57e1..a9de8f02671 100644 --- a/arch/x86_64/kernel/setup.c +++ b/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);