Merge tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux...

[sfrench/cifs-2.6.git] / arch / ia64 / kernel / fsyscall_gtod_data.h

diff --git a/arch/ia64/kernel/fsyscall_gtod_data.h b/arch/ia64/kernel/fsyscall_gtod_data.h
index 0914c02a1eb0b09323b0fc7415a82a674e9f3a12..cc2861445965464b4ce2db003a9c236c4d3cd540 100644 (file)
--- a/arch/ia64/kernel/fsyscall_gtod_data.h
+++ b/arch/ia64/kernel/fsyscall_gtod_data.h
@@ -6,10 +6,16 @@
  * fsyscall gettimeofday data
  */
 
+/* like timespec, but includes "shifted nanoseconds" */
+struct time_sn_spec {
+       u64     sec;
+       u64     snsec;
+};
+
 struct fsyscall_gtod_data_t {
        seqcount_t      seq;
-       struct timespec wall_time;
-       struct timespec monotonic_time;
+       struct time_sn_spec wall_time;
+       struct time_sn_spec monotonic_time;
        u64             clk_mask;
        u32             clk_mult;
        u32             clk_shift;