From: "Jan Beulich" <JBeulich@novell.com>
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>
---
include/asm-x86_64/msr.h | 5 -----
1 files changed, 5 deletions(-)
diff -puN include/asm-x86_64/msr.h~x86_64-eliminate-duplicate-rdpmc-definition include/asm-x86_64/msr.h
--- 25/include/asm-x86_64/msr.h~x86_64-eliminate-duplicate-rdpmc-definition 2005-05-13 22:23:51.000000000 -0700
+++ 25-akpm/include/asm-x86_64/msr.h 2005-05-13 22:23:51.000000000 -0700
@@ -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) \
_