diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 21:15:40 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-13 21:15:40 +0100 |
| commit | f08d8bcc12de5a153e587027e77de83662eefb8a (patch) | |
| tree | 301fedc4a3ba056db2699b471f4cb69edc2151d3 /arch/ia64/kernel/asm-offsets.c | |
| parent | Merge tag 'for-linus' of git://github.com/openrisc/linux (diff) | |
| parent | ia64: Update fsyscall gettime to use modern vsyscall_update (diff) | |
| download | linux-f08d8bcc12de5a153e587027e77de83662eefb8a.tar.xz linux-f08d8bcc12de5a153e587027e77de83662eefb8a.zip | |
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/asm-offsets.c')
| -rw-r--r-- | arch/ia64/kernel/asm-offsets.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c index b385ff2bf6ce..f7693f49c573 100644 --- a/arch/ia64/kernel/asm-offsets.c +++ b/arch/ia64/kernel/asm-offsets.c @@ -212,6 +212,8 @@ void foo(void) BLANK(); DEFINE(IA64_TIMESPEC_TV_NSEC_OFFSET, offsetof (struct timespec, tv_nsec)); + DEFINE(IA64_TIME_SN_SPEC_SNSEC_OFFSET, + offsetof (struct time_sn_spec, snsec)); DEFINE(CLONE_SETTLS_BIT, 19); #if CLONE_SETTLS != (1<<19) |