aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/asm-x86/msr.h2
-rw-r--r--include/asm-x86/paravirt.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
index 088652a62d58..bca8c3950132 100644
--- a/include/asm-x86/msr.h
+++ b/include/asm-x86/msr.h
@@ -157,8 +157,6 @@ static inline int wrmsr_safe(unsigned msr, unsigned low, unsigned high)
157#define rdtscll(val) \ 157#define rdtscll(val) \
158 ((val) = native_read_tsc()) 158 ((val) = native_read_tsc())
159 159
160#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
161
162#define rdpmc(counter,low,high) \ 160#define rdpmc(counter,low,high) \
163 do { \ 161 do { \
164 u64 _l = native_read_pmc(counter); \ 162 u64 _l = native_read_pmc(counter); \
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h
index bef932772661..66290f58e939 100644
--- a/include/asm-x86/paravirt.h
+++ b/include/asm-x86/paravirt.h
@@ -657,8 +657,6 @@ static inline unsigned long long paravirt_sched_clock(void)
657} 657}
658#define calculate_cpu_khz() (pv_time_ops.get_cpu_khz()) 658#define calculate_cpu_khz() (pv_time_ops.get_cpu_khz())
659 659
660#define write_tsc(val1,val2) wrmsr(0x10, val1, val2)
661
662static inline unsigned long long paravirt_read_pmc(int counter) 660static inline unsigned long long paravirt_read_pmc(int counter)
663{ 661{
664 return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter); 662 return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter);