Commit 32ecd42b authored Jun 23, 2005 by Jan Beulich Committed by Linus Torvalds Jun 23, 2005

[PATCH] eliminate duplicate rdpmc definition



Eliminate duplicate definition of rdpmc in x86-64's mtrr.h.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 0928d6ef

include/asm-x86_64/msr.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -57,11 +57,6 @@
		(val) = ((unsigned long)__a) \| (((unsigned long)__d)<<32); \
		} while(0)

		#define rdpmc(counter,low,high) \
		__asm__ __volatile__("rdpmc" \
		: "=a" (low), "=d" (high) \
		: "c" (counter))

		#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)

		#define rdpmc(counter,low,high) \