Signed-off-by: Andrew Morton --- arch/x86_64/kernel/setup.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff -puN arch/x86_64/kernel/setup.c~x86_64-mm-change-assembly-to-use-regular-cpuid_count-macro arch/x86_64/kernel/setup.c --- devel/arch/x86_64/kernel/setup.c~x86_64-mm-change-assembly-to-use-regular-cpuid_count-macro 2006-06-09 15:21:42.000000000 -0700 +++ devel-akpm/arch/x86_64/kernel/setup.c 2006-06-09 15:21:42.000000000 -0700 @@ -950,15 +950,12 @@ static void __cpuinit detect_ht(struct 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); _