From: Glauber de Oliveira Costa Date: Wed, 30 Jan 2008 12:32:05 +0000 (+0100) Subject: x86: cleanup write_tsc X-Git-Tag: v2.6.25-rc1~1143^2~478 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f72a9ef979c5a828c64deb88ebba743f7d899907;p=linux-2.6 x86: cleanup write_tsc write_tsc() does not need to be enclosed in any paravirt closure, as it uses wrmsr(). So we rip off the duplicate in msr.h and the definition from paravirt.h Signed-off-by: Glauber de Oliveira Costa Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h index 088652a62d..bca8c39501 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) #define rdtscll(val) \ ((val) = native_read_tsc()) -#define write_tsc(val1,val2) wrmsr(0x10, val1, val2) - #define rdpmc(counter,low,high) \ do { \ u64 _l = native_read_pmc(counter); \ diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index bef9327726..66290f58e9 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) } #define calculate_cpu_khz() (pv_time_ops.get_cpu_khz()) -#define write_tsc(val1,val2) wrmsr(0x10, val1, val2) - static inline unsigned long long paravirt_read_pmc(int counter) { return PVOP_CALL1(u64, pv_cpu_ops.read_pmc, counter);