Merge branch 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull year 2038 updates from Thomas Gleixner:
"Another round of changes to make the kernel ready for 2038. After lots
of preparatory work this is the first set of syscalls which are 2038
safe:
403 clock_gettime64
404 clock_settime64
405 clock_adjtime64
406 clock_getres_time64
407 clock_nanosleep_time64
408 timer_gettime64
409 timer_settime64
410 timerfd_gettime64
411 timerfd_settime64
412 utimensat_time64
413 pselect6_time64
414 ppoll_time64
416 io_pgetevents_time64
417 recvmmsg_time64
418 mq_timedsend_time64
419 mq_timedreceiv_time64
420 semtimedop_time64
421 rt_sigtimedwait_time64
422 futex_time64
423 sched_rr_get_interval_time64
The syscall numbers are identical all over the architectures"
* 'timers-2038-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (36 commits)
riscv: Use latest system call ABI
checksyscalls: fix up mq_timedreceive and stat exceptions
unicore32: Fix __ARCH_WANT_STAT64 definition
asm-generic: Make time32 syscall numbers optional
asm-generic: Drop getrlimit and setrlimit syscalls from default list
32-bit userspace ABI: introduce ARCH_32BIT_OFF_T config option
compat ABI: use non-compat openat and open_by_handle_at variants
y2038: add 64-bit time_t syscalls to all 32-bit architectures
y2038: rename old time and utime syscalls
y2038: remove struct definition redirects
y2038: use time32 syscall names on 32-bit
syscalls: remove obsolete __IGNORE_ macros
y2038: syscalls: rename y2038 compat syscalls
x86/x32: use time64 versions of sigtimedwait and recvmmsg
timex: change syscalls to use struct __kernel_timex
timex: use __kernel_timex internally
sparc64: add custom adjtimex/clock_adjtime functions
time: fix sys_timer_settime prototype
time: Add struct __kernel_timex
time: make adjtime compat handling available for 32 bit
...
This commit is contained in:
@@ -44,7 +44,7 @@
|
||||
#define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5)
|
||||
#define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
|
||||
|
||||
#define __NR_compat_syscalls 400
|
||||
#define __NR_compat_syscalls 424
|
||||
#endif
|
||||
|
||||
#define __ARCH_WANT_SYS_CLONE
|
||||
|
||||
@@ -270,7 +270,7 @@ __SYSCALL(__NR_uname, sys_newuname)
|
||||
/* 123 was sys_modify_ldt */
|
||||
__SYSCALL(123, sys_ni_syscall)
|
||||
#define __NR_adjtimex 124
|
||||
__SYSCALL(__NR_adjtimex, compat_sys_adjtimex)
|
||||
__SYSCALL(__NR_adjtimex, sys_adjtimex_time32)
|
||||
#define __NR_mprotect 125
|
||||
__SYSCALL(__NR_mprotect, sys_mprotect)
|
||||
#define __NR_sigprocmask 126
|
||||
@@ -344,9 +344,9 @@ __SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
|
||||
#define __NR_sched_get_priority_min 160
|
||||
__SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
|
||||
#define __NR_sched_rr_get_interval 161
|
||||
__SYSCALL(__NR_sched_rr_get_interval, compat_sys_sched_rr_get_interval)
|
||||
__SYSCALL(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32)
|
||||
#define __NR_nanosleep 162
|
||||
__SYSCALL(__NR_nanosleep, compat_sys_nanosleep)
|
||||
__SYSCALL(__NR_nanosleep, sys_nanosleep_time32)
|
||||
#define __NR_mremap 163
|
||||
__SYSCALL(__NR_mremap, sys_mremap)
|
||||
#define __NR_setresuid 164
|
||||
@@ -376,7 +376,7 @@ __SYSCALL(__NR_rt_sigprocmask, compat_sys_rt_sigprocmask)
|
||||
#define __NR_rt_sigpending 176
|
||||
__SYSCALL(__NR_rt_sigpending, compat_sys_rt_sigpending)
|
||||
#define __NR_rt_sigtimedwait 177
|
||||
__SYSCALL(__NR_rt_sigtimedwait, compat_sys_rt_sigtimedwait)
|
||||
__SYSCALL(__NR_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)
|
||||
#define __NR_rt_sigqueueinfo 178
|
||||
__SYSCALL(__NR_rt_sigqueueinfo, compat_sys_rt_sigqueueinfo)
|
||||
#define __NR_rt_sigsuspend 179
|
||||
@@ -502,7 +502,7 @@ __SYSCALL(__NR_tkill, sys_tkill)
|
||||
#define __NR_sendfile64 239
|
||||
__SYSCALL(__NR_sendfile64, sys_sendfile64)
|
||||
#define __NR_futex 240
|
||||
__SYSCALL(__NR_futex, compat_sys_futex)
|
||||
__SYSCALL(__NR_futex, sys_futex_time32)
|
||||
#define __NR_sched_setaffinity 241
|
||||
__SYSCALL(__NR_sched_setaffinity, compat_sys_sched_setaffinity)
|
||||
#define __NR_sched_getaffinity 242
|
||||
@@ -512,7 +512,7 @@ __SYSCALL(__NR_io_setup, compat_sys_io_setup)
|
||||
#define __NR_io_destroy 244
|
||||
__SYSCALL(__NR_io_destroy, sys_io_destroy)
|
||||
#define __NR_io_getevents 245
|
||||
__SYSCALL(__NR_io_getevents, compat_sys_io_getevents)
|
||||
__SYSCALL(__NR_io_getevents, sys_io_getevents_time32)
|
||||
#define __NR_io_submit 246
|
||||
__SYSCALL(__NR_io_submit, compat_sys_io_submit)
|
||||
#define __NR_io_cancel 247
|
||||
@@ -538,21 +538,21 @@ __SYSCALL(__NR_set_tid_address, sys_set_tid_address)
|
||||
#define __NR_timer_create 257
|
||||
__SYSCALL(__NR_timer_create, compat_sys_timer_create)
|
||||
#define __NR_timer_settime 258
|
||||
__SYSCALL(__NR_timer_settime, compat_sys_timer_settime)
|
||||
__SYSCALL(__NR_timer_settime, sys_timer_settime32)
|
||||
#define __NR_timer_gettime 259
|
||||
__SYSCALL(__NR_timer_gettime, compat_sys_timer_gettime)
|
||||
__SYSCALL(__NR_timer_gettime, sys_timer_gettime32)
|
||||
#define __NR_timer_getoverrun 260
|
||||
__SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
|
||||
#define __NR_timer_delete 261
|
||||
__SYSCALL(__NR_timer_delete, sys_timer_delete)
|
||||
#define __NR_clock_settime 262
|
||||
__SYSCALL(__NR_clock_settime, compat_sys_clock_settime)
|
||||
__SYSCALL(__NR_clock_settime, sys_clock_settime32)
|
||||
#define __NR_clock_gettime 263
|
||||
__SYSCALL(__NR_clock_gettime, compat_sys_clock_gettime)
|
||||
__SYSCALL(__NR_clock_gettime, sys_clock_gettime32)
|
||||
#define __NR_clock_getres 264
|
||||
__SYSCALL(__NR_clock_getres, compat_sys_clock_getres)
|
||||
__SYSCALL(__NR_clock_getres, sys_clock_getres_time32)
|
||||
#define __NR_clock_nanosleep 265
|
||||
__SYSCALL(__NR_clock_nanosleep, compat_sys_clock_nanosleep)
|
||||
__SYSCALL(__NR_clock_nanosleep, sys_clock_nanosleep_time32)
|
||||
#define __NR_statfs64 266
|
||||
__SYSCALL(__NR_statfs64, compat_sys_aarch32_statfs64)
|
||||
#define __NR_fstatfs64 267
|
||||
@@ -560,7 +560,7 @@ __SYSCALL(__NR_fstatfs64, compat_sys_aarch32_fstatfs64)
|
||||
#define __NR_tgkill 268
|
||||
__SYSCALL(__NR_tgkill, sys_tgkill)
|
||||
#define __NR_utimes 269
|
||||
__SYSCALL(__NR_utimes, compat_sys_utimes)
|
||||
__SYSCALL(__NR_utimes, sys_utimes_time32)
|
||||
#define __NR_arm_fadvise64_64 270
|
||||
__SYSCALL(__NR_arm_fadvise64_64, compat_sys_aarch32_fadvise64_64)
|
||||
#define __NR_pciconfig_iobase 271
|
||||
@@ -574,9 +574,9 @@ __SYSCALL(__NR_mq_open, compat_sys_mq_open)
|
||||
#define __NR_mq_unlink 275
|
||||
__SYSCALL(__NR_mq_unlink, sys_mq_unlink)
|
||||
#define __NR_mq_timedsend 276
|
||||
__SYSCALL(__NR_mq_timedsend, compat_sys_mq_timedsend)
|
||||
__SYSCALL(__NR_mq_timedsend, sys_mq_timedsend_time32)
|
||||
#define __NR_mq_timedreceive 277
|
||||
__SYSCALL(__NR_mq_timedreceive, compat_sys_mq_timedreceive)
|
||||
__SYSCALL(__NR_mq_timedreceive, sys_mq_timedreceive_time32)
|
||||
#define __NR_mq_notify 278
|
||||
__SYSCALL(__NR_mq_notify, compat_sys_mq_notify)
|
||||
#define __NR_mq_getsetattr 279
|
||||
@@ -622,7 +622,7 @@ __SYSCALL(__NR_semop, sys_semop)
|
||||
#define __NR_semget 299
|
||||
__SYSCALL(__NR_semget, sys_semget)
|
||||
#define __NR_semctl 300
|
||||
__SYSCALL(__NR_semctl, compat_sys_semctl)
|
||||
__SYSCALL(__NR_semctl, compat_sys_old_semctl)
|
||||
#define __NR_msgsnd 301
|
||||
__SYSCALL(__NR_msgsnd, compat_sys_msgsnd)
|
||||
#define __NR_msgrcv 302
|
||||
@@ -630,7 +630,7 @@ __SYSCALL(__NR_msgrcv, compat_sys_msgrcv)
|
||||
#define __NR_msgget 303
|
||||
__SYSCALL(__NR_msgget, sys_msgget)
|
||||
#define __NR_msgctl 304
|
||||
__SYSCALL(__NR_msgctl, compat_sys_msgctl)
|
||||
__SYSCALL(__NR_msgctl, compat_sys_old_msgctl)
|
||||
#define __NR_shmat 305
|
||||
__SYSCALL(__NR_shmat, compat_sys_shmat)
|
||||
#define __NR_shmdt 306
|
||||
@@ -638,7 +638,7 @@ __SYSCALL(__NR_shmdt, sys_shmdt)
|
||||
#define __NR_shmget 307
|
||||
__SYSCALL(__NR_shmget, sys_shmget)
|
||||
#define __NR_shmctl 308
|
||||
__SYSCALL(__NR_shmctl, compat_sys_shmctl)
|
||||
__SYSCALL(__NR_shmctl, compat_sys_old_shmctl)
|
||||
#define __NR_add_key 309
|
||||
__SYSCALL(__NR_add_key, sys_add_key)
|
||||
#define __NR_request_key 310
|
||||
@@ -646,7 +646,7 @@ __SYSCALL(__NR_request_key, sys_request_key)
|
||||
#define __NR_keyctl 311
|
||||
__SYSCALL(__NR_keyctl, compat_sys_keyctl)
|
||||
#define __NR_semtimedop 312
|
||||
__SYSCALL(__NR_semtimedop, compat_sys_semtimedop)
|
||||
__SYSCALL(__NR_semtimedop, sys_semtimedop_time32)
|
||||
#define __NR_vserver 313
|
||||
__SYSCALL(__NR_vserver, sys_ni_syscall)
|
||||
#define __NR_ioprio_set 314
|
||||
@@ -674,7 +674,7 @@ __SYSCALL(__NR_mknodat, sys_mknodat)
|
||||
#define __NR_fchownat 325
|
||||
__SYSCALL(__NR_fchownat, sys_fchownat)
|
||||
#define __NR_futimesat 326
|
||||
__SYSCALL(__NR_futimesat, compat_sys_futimesat)
|
||||
__SYSCALL(__NR_futimesat, sys_futimesat_time32)
|
||||
#define __NR_fstatat64 327
|
||||
__SYSCALL(__NR_fstatat64, sys_fstatat64)
|
||||
#define __NR_unlinkat 328
|
||||
@@ -692,9 +692,9 @@ __SYSCALL(__NR_fchmodat, sys_fchmodat)
|
||||
#define __NR_faccessat 334
|
||||
__SYSCALL(__NR_faccessat, sys_faccessat)
|
||||
#define __NR_pselect6 335
|
||||
__SYSCALL(__NR_pselect6, compat_sys_pselect6)
|
||||
__SYSCALL(__NR_pselect6, compat_sys_pselect6_time32)
|
||||
#define __NR_ppoll 336
|
||||
__SYSCALL(__NR_ppoll, compat_sys_ppoll)
|
||||
__SYSCALL(__NR_ppoll, compat_sys_ppoll_time32)
|
||||
#define __NR_unshare 337
|
||||
__SYSCALL(__NR_unshare, sys_unshare)
|
||||
#define __NR_set_robust_list 338
|
||||
@@ -718,7 +718,7 @@ __SYSCALL(__NR_epoll_pwait, compat_sys_epoll_pwait)
|
||||
#define __NR_kexec_load 347
|
||||
__SYSCALL(__NR_kexec_load, compat_sys_kexec_load)
|
||||
#define __NR_utimensat 348
|
||||
__SYSCALL(__NR_utimensat, compat_sys_utimensat)
|
||||
__SYSCALL(__NR_utimensat, sys_utimensat_time32)
|
||||
#define __NR_signalfd 349
|
||||
__SYSCALL(__NR_signalfd, compat_sys_signalfd)
|
||||
#define __NR_timerfd_create 350
|
||||
@@ -728,9 +728,9 @@ __SYSCALL(__NR_eventfd, sys_eventfd)
|
||||
#define __NR_fallocate 352
|
||||
__SYSCALL(__NR_fallocate, compat_sys_aarch32_fallocate)
|
||||
#define __NR_timerfd_settime 353
|
||||
__SYSCALL(__NR_timerfd_settime, compat_sys_timerfd_settime)
|
||||
__SYSCALL(__NR_timerfd_settime, sys_timerfd_settime32)
|
||||
#define __NR_timerfd_gettime 354
|
||||
__SYSCALL(__NR_timerfd_gettime, compat_sys_timerfd_gettime)
|
||||
__SYSCALL(__NR_timerfd_gettime, sys_timerfd_gettime32)
|
||||
#define __NR_signalfd4 355
|
||||
__SYSCALL(__NR_signalfd4, compat_sys_signalfd4)
|
||||
#define __NR_eventfd2 356
|
||||
@@ -752,7 +752,7 @@ __SYSCALL(__NR_rt_tgsigqueueinfo, compat_sys_rt_tgsigqueueinfo)
|
||||
#define __NR_perf_event_open 364
|
||||
__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
|
||||
#define __NR_recvmmsg 365
|
||||
__SYSCALL(__NR_recvmmsg, compat_sys_recvmmsg)
|
||||
__SYSCALL(__NR_recvmmsg, compat_sys_recvmmsg_time32)
|
||||
#define __NR_accept4 366
|
||||
__SYSCALL(__NR_accept4, sys_accept4)
|
||||
#define __NR_fanotify_init 367
|
||||
@@ -766,7 +766,7 @@ __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
|
||||
#define __NR_open_by_handle_at 371
|
||||
__SYSCALL(__NR_open_by_handle_at, compat_sys_open_by_handle_at)
|
||||
#define __NR_clock_adjtime 372
|
||||
__SYSCALL(__NR_clock_adjtime, compat_sys_clock_adjtime)
|
||||
__SYSCALL(__NR_clock_adjtime, sys_clock_adjtime32)
|
||||
#define __NR_syncfs 373
|
||||
__SYSCALL(__NR_syncfs, sys_syncfs)
|
||||
#define __NR_sendmmsg 374
|
||||
@@ -821,6 +821,51 @@ __SYSCALL(__NR_statx, sys_statx)
|
||||
__SYSCALL(__NR_rseq, sys_rseq)
|
||||
#define __NR_io_pgetevents 399
|
||||
__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)
|
||||
#define __NR_migrate_pages 400
|
||||
__SYSCALL(__NR_migrate_pages, compat_sys_migrate_pages)
|
||||
#define __NR_kexec_file_load 401
|
||||
__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)
|
||||
/* 402 is unused */
|
||||
#define __NR_clock_gettime64 403
|
||||
__SYSCALL(__NR_clock_gettime64, sys_clock_gettime)
|
||||
#define __NR_clock_settime64 404
|
||||
__SYSCALL(__NR_clock_settime64, sys_clock_settime)
|
||||
#define __NR_clock_adjtime64 405
|
||||
__SYSCALL(__NR_clock_adjtime64, sys_clock_adjtime)
|
||||
#define __NR_clock_getres_time64 406
|
||||
__SYSCALL(__NR_clock_getres_time64, sys_clock_getres)
|
||||
#define __NR_clock_nanosleep_time64 407
|
||||
__SYSCALL(__NR_clock_nanosleep_time64, sys_clock_nanosleep)
|
||||
#define __NR_timer_gettime64 408
|
||||
__SYSCALL(__NR_timer_gettime64, sys_timer_gettime)
|
||||
#define __NR_timer_settime64 409
|
||||
__SYSCALL(__NR_timer_settime64, sys_timer_settime)
|
||||
#define __NR_timerfd_gettime64 410
|
||||
__SYSCALL(__NR_timerfd_gettime64, sys_timerfd_gettime)
|
||||
#define __NR_timerfd_settime64 411
|
||||
__SYSCALL(__NR_timerfd_settime64, sys_timerfd_settime)
|
||||
#define __NR_utimensat_time64 412
|
||||
__SYSCALL(__NR_utimensat_time64, sys_utimensat)
|
||||
#define __NR_pselect6_time64 413
|
||||
__SYSCALL(__NR_pselect6_time64, compat_sys_pselect6_time64)
|
||||
#define __NR_ppoll_time64 414
|
||||
__SYSCALL(__NR_ppoll_time64, compat_sys_ppoll_time64)
|
||||
#define __NR_io_pgetevents_time64 416
|
||||
__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)
|
||||
#define __NR_recvmmsg_time64 417
|
||||
__SYSCALL(__NR_recvmmsg_time64, compat_sys_recvmmsg_time64)
|
||||
#define __NR_mq_timedsend_time64 418
|
||||
__SYSCALL(__NR_mq_timedsend_time64, sys_mq_timedsend)
|
||||
#define __NR_mq_timedreceive_time64 419
|
||||
__SYSCALL(__NR_mq_timedreceive_time64, sys_mq_timedreceive)
|
||||
#define __NR_semtimedop_time64 420
|
||||
__SYSCALL(__NR_semtimedop_time64, sys_semtimedop)
|
||||
#define __NR_rt_sigtimedwait_time64 421
|
||||
__SYSCALL(__NR_rt_sigtimedwait_time64, compat_sys_rt_sigtimedwait_time64)
|
||||
#define __NR_futex_time64 422
|
||||
__SYSCALL(__NR_futex_time64, sys_futex)
|
||||
#define __NR_sched_rr_get_interval_time64 423
|
||||
__SYSCALL(__NR_sched_rr_get_interval_time64, sys_sched_rr_get_interval)
|
||||
|
||||
/*
|
||||
* Please add new compat syscalls above this comment and update
|
||||
|
||||
Reference in New Issue
Block a user