diff options
| author | Linus Torvalds | 2017-11-13 21:15:40 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-11-13 21:15:40 +0100 |
| commit | f08d8bcc12de5a153e587027e77de83662eefb8a (patch) | |
| tree | 301fedc4a3ba056db2699b471f4cb69edc2151d3 /arch/ia64/Kconfig | |
| parent | Merge tag 'for-linus' of git://github.com/openrisc/linux (diff) | |
| parent | ia64: Update fsyscall gettime to use modern vsyscall_update (diff) | |
| download | kernel-qcow2-linux-f08d8bcc12de5a153e587027e77de83662eefb8a.tar.gz kernel-qcow2-linux-f08d8bcc12de5a153e587027e77de83662eefb8a.tar.xz kernel-qcow2-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/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 1efc444f5fa1..49583c5a5d44 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -47,7 +47,7 @@ config IA64 select ARCH_TASK_STRUCT_ALLOCATOR select ARCH_THREAD_STACK_ALLOCATOR select ARCH_CLOCKSOURCE_DATA - select GENERIC_TIME_VSYSCALL_OLD + select GENERIC_TIME_VSYSCALL select SYSCTL_ARCH_UNALIGN_NO_WARN select HAVE_MOD_ARCH_SPECIFIC select MODULES_USE_ELF_RELA |