diff options
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/trace-clock.h | 7 | ||||
| -rw-r--r-- | arch/x86/include/asm/vgtod.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/vsyscall.h | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/include/asm/trace-clock.h b/arch/x86/include/asm/trace-clock.h index 5f6a36684c9..8ca73323366 100644 --- a/arch/x86/include/asm/trace-clock.h +++ b/arch/x86/include/asm/trace-clock.h @@ -11,12 +11,19 @@ */ #include <linux/timex.h> +#include <linux/time.h> #include <asm/system.h> #include <asm/processor.h> #include <asm/atomic.h> /* Minimum duration of a probe, in cycles */ #define TRACE_CLOCK_MIN_PROBE_DURATION 200 +#define TRACE_CLOCK_RES TRACE_CLOCK_MIN_PROBE_DURATION + +union lttng_timespec { + struct timespec ts; + u64 lttng_ts; +}; extern cycles_t trace_clock_async_tsc_read(void); diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h index 3d61e204826..06abe8f409a 100644 --- a/arch/x86/include/asm/vgtod.h +++ b/arch/x86/include/asm/vgtod.h @@ -12,6 +12,7 @@ struct vsyscall_gtod_data { u32 wall_time_nsec; int sysctl_enabled; + int trace_clock_is_sync; struct timezone sys_tz; struct { /* extract of a clocksource struct */ cycle_t (*vread)(void); diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index d0983d255fb..47b80f3ba4d 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -39,6 +39,14 @@ extern struct timezone sys_tz; extern void map_vsyscall(void); +#ifdef CONFIG_X86_64 +extern void update_trace_clock_is_sync_vdso(void); +#else +static inline void update_trace_clock_is_sync_vdso(void) +{ +} +#endif + #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ |