diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:15:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 12:15:40 -0800 |
| commit | f08d8bcc12de5a153e587027e77de83662eefb8a (patch) | |
| tree | 301fedc4a3ba056db2699b471f4cb69edc2151d3 /arch/ia64/kernel/fsyscall_gtod_data.h | |
| parent | f3573b8f902c507c721999cc669fbb7e045081b8 (diff) | |
| parent | d4d1fc61eb38ff8e5af657e2d2f2290859a277f2 (diff) | |
Merge tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck:
"Stop ia64 being the last holdout using GENERIC_TIME_VSYSCALL_OLD so
that John Stultz can drop that code"
* tag 'please-pull-gettime_vsyscall_update' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: Update fsyscall gettime to use modern vsyscall_update
Diffstat (limited to 'arch/ia64/kernel/fsyscall_gtod_data.h')
| -rw-r--r-- | arch/ia64/kernel/fsyscall_gtod_data.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/ia64/kernel/fsyscall_gtod_data.h b/arch/ia64/kernel/fsyscall_gtod_data.h index 0914c02a1eb0..cc2861445965 100644 --- 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; |