diff options
| author | Jan Beulich <JBeulich@novell.com> | 2005-06-23 00:08:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:45:13 -0700 |
| commit | 32ecd42b6f94d3ee320a22827b46bd19ccf924e5 (patch) | |
| tree | ea74d38338f800940e630d075ca157149871f37d /include/asm-x86_64 | |
| parent | 0928d6ef7f204979749fb241a90a04a35dae133a (diff) | |
| download | linux-3.10-32ecd42b6f94d3ee320a22827b46bd19ccf924e5.tar.gz linux-3.10-32ecd42b6f94d3ee320a22827b46bd19ccf924e5.tar.bz2 linux-3.10-32ecd42b6f94d3ee320a22827b46bd19ccf924e5.zip | |
[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>
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/msr.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h index 513e52c7182..bc700232728 100644 --- a/include/asm-x86_64/msr.h +++ b/include/asm-x86_64/msr.h @@ -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) \ |