Messages in this thread Patches in this message | | | Date | Thu, 12 May 2005 10:48:27 +0200 | From | "Jan Beulich" <> | Subject | [PATCH] eliminate duplicate rdpmc definition |
| |
(Note: Patch also attached because the inline version is certain to get line wrapped.)
Eliminate duplicate definition of rdpmc in x86-64's mtrr.h.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
diff -Npru linux-2.6.12-rc4.base/include/asm-x86_64/msr.h linux-2.6.12-rc4/include/asm-x86_64/msr.h --- linux-2.6.12-rc4.base/include/asm-x86_64/msr.h 2005-05-11 17:28:24.819299352 +0200 +++ linux-2.6.12-rc4/include/asm-x86_64/msr.h 2005-05-11 17:50:36.308882168 +0200 @@ -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) \
(Note: Patch also attached because the inline version is certain to get line wrapped.)
Eliminate duplicate definition of rdpmc in x86-64's mtrr.h.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
diff -Npru linux-2.6.12-rc4.base/include/asm-x86_64/msr.h linux-2.6.12-rc4/include/asm-x86_64/msr.h --- linux-2.6.12-rc4.base/include/asm-x86_64/msr.h 2005-05-11 17:28:24.819299352 +0200 +++ linux-2.6.12-rc4/include/asm-x86_64/msr.h 2005-05-11 17:50:36.308882168 +0200 @@ -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) \ | |