diff options
| author | Rohit Seth <rohitseth@google.com> | 2006-06-26 13:58:02 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 19:48:18 +0200 |
| commit | 2bbc419f9d51b44f3fdeea12c5b786bdace82b8e (patch) | |
| tree | b7b3bbea8a92aaabd35571f1bdf7ca601626fe90 /arch/x86_64/kernel | |
| parent | [PATCH] x86_64: use halt() instead of raw inline assembly (diff) | |
| download | linux-2bbc419f9d51b44f3fdeea12c5b786bdace82b8e.tar.xz linux-2bbc419f9d51b44f3fdeea12c5b786bdace82b8e.zip | |
[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 <rohitseth@google.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 816203d57e11..a9de8f02671f 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); |