Skip to contentSkip to conversation

eliminate duplicate rdpmc definition

PATCH New Jan Beulich 1 participant 1 message May 12, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

include/asm-x86_64/msr.h +0 -5
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
@@ -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.

include/asm-x86_64/msr.h +0 -5
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
@@ -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) \