Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f72a9ef9 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

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: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a4746364

include/asm-x86/msr.h

+0 −2
Original line number Diff line number Diff line
@@ -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);		\

include/asm-x86/paravirt.h

+0 −2
Original line number Diff line number Diff line
@@ -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);