FROMLIST: [PATCH v5 10/12] arm64: vdso: replace gettimeofday.S with global vgettimeof...

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / arch / arm64 / include / asm / vdso_datapage.h

diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h
index de66199673d7ae23678c72bd898953af869a4b87..95f4a7abab803c9228577290731d76487c0a82fb 100644 (file)
--- a/arch/arm64/include/asm/vdso_datapage.h
+++ b/arch/arm64/include/asm/vdso_datapage.h
@@ -20,17 +20,36 @@
 
 #ifndef __ASSEMBLY__
 
+#ifndef _VDSO_WTM_CLOCK_SEC_T
+#define _VDSO_WTM_CLOCK_SEC_T
+typedef __u64 vdso_wtm_clock_nsec_t;
+#endif
+
+#ifndef _VDSO_XTIME_CLOCK_SEC_T
+#define _VDSO_XTIME_CLOCK_SEC_T
+typedef __u64 vdso_xtime_clock_sec_t;
+#endif
+
+#ifndef _VDSO_RAW_TIME_SEC_T
+#define _VDSO_RAW_TIME_SEC_T
+typedef __u64 vdso_raw_time_sec_t;
+#endif
+
 struct vdso_data {
        __u64 cs_cycle_last;    /* Timebase at clocksource init */
-       __u64 xtime_clock_sec;  /* Kernel time */
-       __u64 xtime_clock_nsec;
+       vdso_raw_time_sec_t raw_time_sec;       /* Raw time */
+       __u64 raw_time_nsec;
+       vdso_xtime_clock_sec_t xtime_clock_sec; /* Kernel time */
+       __u64 xtime_clock_snsec;
        __u64 xtime_coarse_sec; /* Coarse time */
        __u64 xtime_coarse_nsec;
        __u64 wtm_clock_sec;    /* Wall to monotonic time */
-       __u64 wtm_clock_nsec;
+       vdso_wtm_clock_nsec_t wtm_clock_nsec;
        __u32 tb_seq_count;     /* Timebase sequence counter */
-       __u32 cs_mult;          /* Clocksource multiplier */
-       __u32 cs_shift;         /* Clocksource shift */
+       /* cs_* members must be adjacent and in this order (ldp accesses) */
+       __u32 cs_mono_mult;     /* NTP-adjusted clocksource multiplier */
+       __u32 cs_shift;         /* Clocksource shift (mono = raw) */
+       __u32 cs_raw_mult;      /* Raw clocksource multiplier */
        __u32 tz_minuteswest;   /* Whacky timezone stuff */
        __u32 tz_dsttime;
        __u32 use_syscall;