Merge branch 'for_3.4/pm/smps-regulator' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / arch / x86 / include / asm / vgtod.h

diff --git a/arch/x86/include/asm/vgtod.h b/arch/x86/include/asm/vgtod.h
index 815285b..8b38be2 100644 (file)
--- a/arch/x86/include/asm/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
@@ -5,13 +5,8 @@
 #include <linux/clocksource.h>
 
 struct vsyscall_gtod_data {
-       seqlock_t       lock;
+       seqcount_t      seq;
 
-       /* open coded 'struct timespec' */
-       time_t          wall_time_sec;
-       u32             wall_time_nsec;
-
-       struct timezone sys_tz;
        struct { /* extract of a clocksource struct */
                int vclock_mode;
                cycle_t cycle_last;
@@ -19,8 +14,16 @@ struct vsyscall_gtod_data {
                u32     mult;
                u32     shift;
        } clock;
-       struct timespec wall_to_monotonic;
+
+       /* open coded 'struct timespec' */
+       time_t          wall_time_sec;
+       u32             wall_time_nsec;
+       u32             monotonic_time_nsec;
+       time_t          monotonic_time_sec;
+
+       struct timezone sys_tz;
        struct timespec wall_time_coarse;
+       struct timespec monotonic_time_coarse;
 };
 extern struct vsyscall_gtod_data vsyscall_gtod_data;