Skip to content

Commit

Permalink
x86: move native_read_tsc() offline
Browse files Browse the repository at this point in the history
move native_read_tsc() offline.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Ingo Molnar committed Jan 30, 2008
1 parent fde1b3f commit cdc7957
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
10 changes: 10 additions & 0 deletions arch/x86/kernel/rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <linux/mc146818rtc.h>

#include <asm/time.h>
#include <asm/vsyscall.h>

#ifdef CONFIG_X86_32
# define CMOS_YEARS_OFFS 1900
Expand Down Expand Up @@ -194,3 +195,12 @@ int update_persistent_clock(struct timespec now)
{
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);
8 changes: 1 addition & 7 deletions include/asm-x86/msr.h
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,7 @@ static inline int native_write_msr_safe(unsigned int msr,
return err;
}

static inline 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);
}
extern unsigned long long native_read_tsc(void);

static inline unsigned long long native_read_pmc(int counter)
{
Expand Down

0 comments on commit cdc7957

Please sign in to comment.