[PATCH]:x86_64: Change assembly to use regular cpuid_count macro

Rohit Seth
2006-05-24T22:25:39Z

Minor cleanup patch:

Replacing the asm statement with cpuid_count macro(which already
provides the same functionality).

Signed-off-by: Rohit Seth <rohitseth@google.com>

arch/x86_64/kernel/setup.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

--- linux-2.6.17-rc4.org/arch/x86_64/kernel/setup.c 2006-05-24 13:47:11.000000000 -0700
+++ linux-2.6.17-rc4/arch/x86_64/kernel/setup.c 2006-05-24 14:37:25.000000000 -0700
@@ -1024,15 +1024,12 @@
*/
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);