[PATCH 03/15] cleanup write_tsc

Glauber de Oliveira Costa
2007-12-20T20:09:04Z

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 <gcosta@redhat.com>
---
include/asm-x86/msr.h | 2 --
include/asm-x86/paravirt.h | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)

Index: linux-2.6-x86/include/asm-x86/msr.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/msr.h 2007-12-20 19:06:59.000000000 -0800
+++ linux-2.6-x86/include/asm-x86/msr.h 2007-12-20 19:07:18.000000000 -0800
@@ -153,8 +153,6 @@
#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); \
Index: linux-2.6-x86/include/asm-x86/paravirt.h
===================================================================
--- linux-2.6-x86.orig/include/asm-x86/paravirt.h 2007-12-20 19:07:17.000000000 -0800
+++ linux-2.6-x86/include/asm-x86/paravirt.h 2007-12-20 19:07:18.000000000 -0800
@@ -657,8 +657,6 @@
}
#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);