Commit 2bbc419f authored Jun 26, 2006 by Rohit Seth Committed by Linus Torvalds Jun 26, 2006

[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>

parent 46d13a38

arch/x86_64/kernel/setup.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -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);