diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 13:32:05 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:32:05 +0100 |
| commit | f72a9ef979c5a828c64deb88ebba743f7d899907 (patch) | |
| tree | 130bdcc79d525bf3620cffbed58d26ac6d369e72 /include | |
| parent | a4746364da0c7caa155cc945a5c10312e7925b46 (diff) | |
| download | kernel-common-f72a9ef979c5a828c64deb88ebba743f7d899907.tar.gz kernel-common-f72a9ef979c5a828c64deb88ebba743f7d899907.tar.bz2 kernel-common-f72a9ef979c5a828c64deb88ebba743f7d899907.zip | |
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 <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/msr.h | 2 | ||||
| -rw-r--r-- | include/asm-x86/paravirt.h | 2 |
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) #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 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) } #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); |