Skip to content

Commit

Permalink
[PATCH] x86_64: Change assembly to use regular cpuid_count macro
Browse files Browse the repository at this point in the history
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>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Rohit Seth authored and Linus Torvalds committed Jun 26, 2006
1 parent 46d13a3 commit 2bbc419
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions arch/x86_64/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 2bbc419

Please sign in to comment.