These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / x86 / include / asm / tsc.h

diff --git a/kernel/arch/x86/include/asm/tsc.h b/kernel/arch/x86/include/asm/tsc.h
index 94605c0..6d7c547 100644 (file)
--- a/kernel/arch/x86/include/asm/tsc.h
+++ b/kernel/arch/x86/include/asm/tsc.h
@@ -21,28 +21,12 @@ extern void disable_TSC(void);
 
 static inline cycles_t get_cycles(void)
 {
-       unsigned long long ret = 0;
-
 #ifndef CONFIG_X86_TSC
        if (!cpu_has_tsc)
                return 0;
 #endif
-       rdtscll(ret);
-
-       return ret;
-}
 
-static __always_inline cycles_t vget_cycles(void)
-{
-       /*
-        * We only do VDSOs on TSC capable CPUs, so this shouldn't
-        * access boot_cpu_data (which is not VDSO-safe):
-        */
-#ifndef CONFIG_X86_TSC
-       if (!cpu_has_tsc)
-               return 0;
-#endif
-       return (cycles_t)__native_read_tsc();
+       return rdtsc();
 }
 
 extern void tsc_init(void);
@@ -51,6 +35,7 @@ extern int unsynchronized_tsc(void);
 extern int check_tsc_unstable(void);
 extern int check_tsc_disabled(void);
 extern unsigned long native_calibrate_tsc(void);
+extern unsigned long long native_sched_clock_from_tsc(u64 tsc);
 
 extern int tsc_clocksource_reliable;