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

Commit cdc7957d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: move native_read_tsc() offline 



move native_read_tsc() offline.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent fde1b3fa

arch/x86/kernel/rtc.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <linux/mc146818rtc.h>

#include <linux/mc146818rtc.h>





#include <asm/time.h>

#include <asm/time.h>

#include <asm/vsyscall.h>





#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

# define CMOS_YEARS_OFFS 1900

# define CMOS_YEARS_OFFS 1900
@@ -194,3 +195,12 @@ int update_persistent_clock(struct timespec now) 
{

{

	return set_rtc_mmss(now.tv_sec);

	return set_rtc_mmss(now.tv_sec);

}

}



unsigned long long __vsyscall_fn native_read_tsc(void)

{

	DECLARE_ARGS(val, low, high);



	asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));

	return EAX_EDX_VAL(val, low, high);

}

EXPORT_SYMBOL_GPL(native_read_tsc);

include/asm-x86/msr.h

+1 −7
Original line number Original line Diff line number Diff line
@@ -91,13 +91,7 @@ static inline int native_write_msr_safe(unsigned int msr, 
	return err;

	return err;

}

}





static inline unsigned long long native_read_tsc(void)

extern unsigned long long native_read_tsc(void);

{

	DECLARE_ARGS(val, low, high);



	asm volatile("rdtsc" : EAX_EDX_RET(val, low, high));

	return EAX_EDX_VAL(val, low, high);

}





static inline unsigned long long native_read_pmc(int counter)

static inline unsigned long long native_read_pmc(int counter)

{

{