y2038: add 64-bit time_t syscalls to all 32-bit architectures

This adds 21 new system calls on each ABI that has 32-bit time_t
today. All of these have the exact same semantics as their existing
counterparts, and the new ones all have macro names that end in 'time64'
for clarification.

This gets us to the point of being able to safely use a C library
that has 64-bit time_t in user space. There are still a couple of
loose ends to tie up in various areas of the code, but this is the
big one, and should be entirely uncontroversial at this point.

In particular, there are four system calls (getitimer, setitimer,
waitid, and getrusage) that don't have a 64-bit counterpart yet,
but these can all be safely implemented in the C library by wrapping
around the existing system calls because the 32-bit time_t they
pass only counts elapsed time, not time since the epoch. They
will be dealt with later.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index 340b88dd397ecd409aa6ca79a8f09f91b7135634..63ed39cbd3bd13a40e98ec3a9aff3b3266b3e235 100644 (file)
--- a/arch/alpha/kernel/syscalls/syscall.tbl
+++ b/arch/alpha/kernel/syscalls/syscall.tbl
@@ -461,3 +461,5 @@
 530    common  getegid                         sys_getegid
 531    common  geteuid                         sys_geteuid
 532    common  getppid                         sys_getppid
+# all other architectures have common numbers for new syscall, alpha
+# is the exception.

diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index a96d9b5ee04e3e68d6fd89bbf2f05b06f007db8e..9016f4081bb9cff33886860e9a1d48f0ee58e47c 100644 (file)
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -416,3 +416,24 @@
 399    common  io_pgetevents           sys_io_pgetevents_time32
 400    common  migrate_pages           sys_migrate_pages
 401    common  kexec_file_load         sys_kexec_file_load
+# 402 is unused
+403    common  clock_gettime64                 sys_clock_gettime
+404    common  clock_settime64                 sys_clock_settime
+405    common  clock_adjtime64                 sys_clock_adjtime
+406    common  clock_getres_time64             sys_clock_getres
+407    common  clock_nanosleep_time64          sys_clock_nanosleep
+408    common  timer_gettime64                 sys_timer_gettime
+409    common  timer_settime64                 sys_timer_settime
+410    common  timerfd_gettime64               sys_timerfd_gettime
+411    common  timerfd_settime64               sys_timerfd_settime
+412    common  utimensat_time64                sys_utimensat
+413    common  pselect6_time64                 sys_pselect6
+414    common  ppoll_time64                    sys_ppoll
+416    common  io_pgetevents_time64            sys_io_pgetevents
+417    common  recvmmsg_time64                 sys_recvmmsg
+418    common  mq_timedsend_time64             sys_mq_timedsend
+419    common  mq_timedreceive_time64          sys_mq_timedreceive
+420    common  semtimedop_time64               sys_semtimedop
+421    common  rt_sigtimedwait_time64          sys_rt_sigtimedwait
+422    common  futex_time64                    sys_futex
+423    common  sched_rr_get_interval_time64    sys_sched_rr_get_interval

diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h
index 2c30e6f145ff2c9f00e6b5fe4c24e6144cc5a61f..d1dd93436e1eedad0ea3cf83ba1cdc6b3fd50c22 100644 (file)
--- a/arch/arm64/include/asm/unistd.h
+++ b/arch/arm64/include/asm/unistd.h
@@ -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           402
+#define __NR_compat_syscalls           424
 #endif
 
 #define __ARCH_WANT_SYS_CLONE

diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h
index 1ded828571615f8902d9ada542f74e33a13e1e40..5590f262369079bca3b66561a51e9b3f4705cdd7 100644 (file)
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -825,6 +825,47 @@ __SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)
 __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

diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl
index 52319006de0d7e0766fe0e85bdff638beb7cf598..ab9cda5f6136ad60753de5e725f6a6271ad88e9c 100644 (file)
--- a/arch/ia64/kernel/syscalls/syscall.tbl
+++ b/arch/ia64/kernel/syscalls/syscall.tbl
@@ -343,3 +343,4 @@
 331    common  pkey_alloc                      sys_pkey_alloc
 332    common  pkey_free                       sys_pkey_free
 333    common  rseq                            sys_rseq
+# 334 through 423 are reserved to sync up with other architectures

diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl
index 253bd2a069bd5dc67b6ddd9e9ca6978f1e777a62..125c14178979c010648895bd7925f85e5e54b10d 100644 (file)
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@ -403,3 +403,23 @@
 400    common  msgsnd                          sys_msgsnd
 401    common  msgrcv                          sys_msgrcv
 402    common  msgctl                          sys_msgctl
+403    common  clock_gettime64                 sys_clock_gettime
+404    common  clock_settime64                 sys_clock_settime
+405    common  clock_adjtime64                 sys_clock_adjtime
+406    common  clock_getres_time64             sys_clock_getres
+407    common  clock_nanosleep_time64          sys_clock_nanosleep
+408    common  timer_gettime64                 sys_timer_gettime
+409    common  timer_settime64                 sys_timer_settime
+410    common  timerfd_gettime64               sys_timerfd_gettime
+411    common  timerfd_settime64               sys_timerfd_settime
+412    common  utimensat_time64                sys_utimensat
+413    common  pselect6_time64                 sys_pselect6
+414    common  ppoll_time64                    sys_ppoll
+416    common  io_pgetevents_time64            sys_io_pgetevents
+417    common  recvmmsg_time64                 sys_recvmmsg
+418    common  mq_timedsend_time64             sys_mq_timedsend
+419    common  mq_timedreceive_time64          sys_mq_timedreceive
+420    common  semtimedop_time64               sys_semtimedop
+421    common  rt_sigtimedwait_time64          sys_rt_sigtimedwait
+422    common  futex_time64                    sys_futex
+423    common  sched_rr_get_interval_time64    sys_sched_rr_get_interval

diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl
index 44a87649d6814205b46bd5c6b501574389dda390..8ee3a8c18498eb591ab9d1fc2b2044d43afa1cd4 100644 (file)
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@ -408,3 +408,24 @@
 398    common  statx                           sys_statx
 399    common  io_pgetevents                   sys_io_pgetevents_time32
 400    common  rseq                            sys_rseq
+# 401 and 402 are unused
+403    common  clock_gettime64                 sys_clock_gettime
+404    common  clock_settime64                 sys_clock_settime
+405    common  clock_adjtime64                 sys_clock_adjtime
+406    common  clock_getres_time64             sys_clock_getres
+407    common  clock_nanosleep_time64          sys_clock_nanosleep
+408    common  timer_gettime64                 sys_timer_gettime
+409    common  timer_settime64                 sys_timer_settime
+410    common  timerfd_gettime64               sys_timerfd_gettime
+411    common  timerfd_settime64               sys_timerfd_settime
+412    common  utimensat_time64                sys_utimensat
+413    common  pselect6_time64                 sys_pselect6
+414    common  ppoll_time64                    sys_ppoll
+416    common  io_pgetevents_time64            sys_io_pgetevents
+417    common  recvmmsg_time64                 sys_recvmmsg
+418    common  mq_timedsend_time64             sys_mq_timedsend
+419    common  mq_timedreceive_time64          sys_mq_timedreceive
+420    common  semtimedop_time64               sys_semtimedop
+421    common  rt_sigtimedwait_time64          sys_rt_sigtimedwait
+422    common  futex_time64                    sys_futex
+423    common  sched_rr_get_interval_time64    sys_sched_rr_get_interval

diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
index 6d1e019817c859f7d01394e44052a1c4d211d494..15f4117900ee8d8c9285b61dd332b3c1832558ea 100644 (file)
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -341,3 +341,24 @@
 330    n32     statx                           sys_statx
 331    n32     rseq                            sys_rseq
 332    n32     io_pgetevents                   compat_sys_io_pgetevents
+# 333 through 402 are unassigned to sync up with generic numbers
+403    n32     clock_gettime64                 sys_clock_gettime
+404    n32     clock_settime64                 sys_clock_settime
+405    n32     clock_adjtime64                 sys_clock_adjtime
+406    n32     clock_getres_time64             sys_clock_getres
+407    n32     clock_nanosleep_time64          sys_clock_nanosleep
+408    n32     timer_gettime64                 sys_timer_gettime
+409    n32     timer_settime64                 sys_timer_settime
+410    n32     timerfd_gettime64               sys_timerfd_gettime
+411    n32     timerfd_settime64               sys_timerfd_settime
+412    n32     utimensat_time64                sys_utimensat
+413    n32     pselect6_time64                 compat_sys_pselect6_time64
+414    n32     ppoll_time64                    compat_sys_ppoll_time64
+416    n32     io_pgetevents_time64            sys_io_pgetevents
+417    n32     recvmmsg_time64                 compat_sys_recvmmsg_time64
+418    n32     mq_timedsend_time64             sys_mq_timedsend
+419    n32     mq_timedreceive_time64          sys_mq_timedreceive
+420    n32     semtimedop_time64               sys_semtimedop
+421    n32     rt_sigtimedwait_time64          compat_sys_rt_sigtimedwait_time64
+422    n32     futex_time64                    sys_futex
+423    n32     sched_rr_get_interval_time64    sys_sched_rr_get_interval

diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl
index af0da757a7b2d2a2f696cf5cfde4583859e8fb6a..c85502e67b44145420d6638489300aae4388cefe 100644 (file)
--- a/arch/mips/kernel/syscalls/syscall_n64.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n64.tbl
@@ -337,3 +337,4 @@
 326    n64     statx                           sys_statx
 327    n64     rseq                            sys_rseq
 328    n64     io_pgetevents                   sys_io_pgetevents
+# 329 through 423 are reserved to sync up with other architectures

diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl
index 54312c5b5343eb65600c749ec5a22c92b0a3f26e..2e063d0f837e78c3cb566d68374c33e7bcdd9a8e 100644 (file)
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -391,3 +391,23 @@
 400    o32     msgsnd                          sys_msgsnd                      compat_sys_msgsnd
 401    o32     msgrcv                          sys_msgrcv                      compat_sys_msgrcv
 402    o32     msgctl                          sys_msgctl                      compat_sys_msgctl
+403    o32     clock_gettime64                 sys_clock_gettime               sys_clock_gettime
+404    o32     clock_settime64                 sys_clock_settime               sys_clock_settime
+405    o32     clock_adjtime64                 sys_clock_adjtime               sys_clock_adjtime
+406    o32     clock_getres_time64             sys_clock_getres                sys_clock_getres
+407    o32     clock_nanosleep_time64          sys_clock_nanosleep             sys_clock_nanosleep
+408    o32     timer_gettime64                 sys_timer_gettime               sys_timer_gettime
+409    o32     timer_settime64                 sys_timer_settime               sys_timer_settime
+410    o32     timerfd_gettime64               sys_timerfd_gettime             sys_timerfd_gettime
+411    o32     timerfd_settime64               sys_timerfd_settime             sys_timerfd_settime
+412    o32     utimensat_time64                sys_utimensat                   sys_utimensat
+413    o32     pselect6_time64                 sys_pselect6                    compat_sys_pselect6_time64
+414    o32     ppoll_time64                    sys_ppoll                       compat_sys_ppoll_time64
+416    o32     io_pgetevents_time64            sys_io_pgetevents               sys_io_pgetevents
+417    o32     recvmmsg_time64                 sys_recvmmsg                    compat_sys_recvmmsg_time64
+418    o32     mq_timedsend_time64             sys_mq_timedsend                sys_mq_timedsend
+419    o32     mq_timedreceive_time64          sys_mq_timedreceive             sys_mq_timedreceive
+420    o32     semtimedop_time64               sys_semtimedop                  sys_semtimedop
+421    o32     rt_sigtimedwait_time64          sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait_time64
+422    o32     futex_time64                    sys_futex                       sys_futex
+423    o32     sched_rr_get_interval_time64    sys_sched_rr_get_interval       sys_sched_rr_get_interval

diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
index 7eff3dc3d613d5aa3420e2729b29744ca622b748..b26766c6647dc7a40fd3235460902112c20cd3d4 100644 (file)
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -399,3 +399,24 @@
 352    common  pkey_alloc              sys_pkey_alloc
 353    common  pkey_free               sys_pkey_free
 354    common  rseq                    sys_rseq
+# 355 through 402 are unassigned to sync up with generic numbers
+403    32      clock_gettime64                 sys_clock_gettime               sys_clock_gettime
+404    32      clock_settime64                 sys_clock_settime               sys_clock_settime
+405    32      clock_adjtime64                 sys_clock_adjtime               sys_clock_adjtime
+406    32      clock_getres_time64             sys_clock_getres                sys_clock_getres
+407    32      clock_nanosleep_time64          sys_clock_nanosleep             sys_clock_nanosleep
+408    32      timer_gettime64                 sys_timer_gettime               sys_timer_gettime
+409    32      timer_settime64                 sys_timer_settime               sys_timer_settime
+410    32      timerfd_gettime64               sys_timerfd_gettime             sys_timerfd_gettime
+411    32      timerfd_settime64               sys_timerfd_settime             sys_timerfd_settime
+412    32      utimensat_time64                sys_utimensat                   sys_utimensat
+413    32      pselect6_time64                 sys_pselect6                    compat_sys_pselect6_time64
+414    32      ppoll_time64                    sys_ppoll                       compat_sys_ppoll_time64
+416    32      io_pgetevents_time64            sys_io_pgetevents               sys_io_pgetevents
+417    32      recvmmsg_time64                 sys_recvmmsg                    compat_sys_recvmmsg_time64
+418    32      mq_timedsend_time64             sys_mq_timedsend                sys_mq_timedsend
+419    32      mq_timedreceive_time64          sys_mq_timedreceive             sys_mq_timedreceive
+420    32      semtimedop_time64               sys_semtimedop                  sys_semtimedop
+421    32      rt_sigtimedwait_time64          sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait_time64
+422    32      futex_time64                    sys_futex                       sys_futex
+423    32      sched_rr_get_interval_time64    sys_sched_rr_get_interval       sys_sched_rr_get_interval

diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl
index 500edbf9e8a6cd32160d418383427d2d13c7a321..b18abb0c3dae6248cfd697b1b9ee2343c39e1ba3 100644 (file)
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@ -485,3 +485,23 @@
 400    common  msgsnd                          sys_msgsnd                      compat_sys_msgsnd
 401    common  msgrcv                          sys_msgrcv                      compat_sys_msgrcv
 402    common  msgctl                          sys_msgctl                      compat_sys_msgctl
+403    32      clock_gettime64                 sys_clock_gettime               sys_clock_gettime
+404    32      clock_settime64                 sys_clock_settime               sys_clock_settime
+405    32      clock_adjtime64                 sys_clock_adjtime               sys_clock_adjtime
+406    32      clock_getres_time64             sys_clock_getres                sys_clock_getres
+407    32      clock_nanosleep_time64          sys_clock_nanosleep             sys_clock_nanosleep
+408    32      timer_gettime64                 sys_timer_gettime               sys_timer_gettime
+409    32      timer_settime64                 sys_timer_settime               sys_timer_settime
+410    32      timerfd_gettime64               sys_timerfd_gettime             sys_timerfd_gettime
+411    32      timerfd_settime64               sys_timerfd_settime             sys_timerfd_settime
+412    32      utimensat_time64                sys_utimensat                   sys_utimensat
+413    32      pselect6_time64                 sys_pselect6                    compat_sys_pselect6_time64
+414    32      ppoll_time64                    sys_ppoll                       compat_sys_ppoll_time64
+416    32      io_pgetevents_time64            sys_io_pgetevents               sys_io_pgetevents
+417    32      recvmmsg_time64                 sys_recvmmsg                    compat_sys_recvmmsg_time64
+418    32      mq_timedsend_time64             sys_mq_timedsend                sys_mq_timedsend
+419    32      mq_timedreceive_time64          sys_mq_timedreceive             sys_mq_timedreceive
+420    32      semtimedop_time64               sys_semtimedop                  sys_semtimedop
+421    32      rt_sigtimedwait_time64          sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait_time64
+422    32      futex_time64                    sys_futex                       sys_futex
+423    32      sched_rr_get_interval_time64    sys_sched_rr_get_interval       sys_sched_rr_get_interval

diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
index 285201cf1f834cd188668281ac6399d79ff176e4..02579f95f391b6524ddd28004cc6d6a511be974b 100644 (file)
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@ -406,3 +406,23 @@
 400  common    msgsnd                  sys_msgsnd                      compat_sys_msgsnd
 401  common    msgrcv                  sys_msgrcv                      compat_sys_msgrcv
 402  common    msgctl                  sys_msgctl                      compat_sys_msgctl
+403    32      clock_gettime64         -                               sys_clock_gettime
+404    32      clock_settime64         -                               sys_clock_settime
+405    32      clock_adjtime64         -                               sys_clock_adjtime
+406    32      clock_getres_time64     -                               sys_clock_getres
+407    32      clock_nanosleep_time64  -                               sys_clock_nanosleep
+408    32      timer_gettime64         -                               sys_timer_gettime
+409    32      timer_settime64         -                               sys_timer_settime
+410    32      timerfd_gettime64       -                               sys_timerfd_gettime
+411    32      timerfd_settime64       -                               sys_timerfd_settime
+412    32      utimensat_time64        -                               sys_utimensat
+413    32      pselect6_time64         -                               compat_sys_pselect6_time64
+414    32      ppoll_time64            -                               compat_sys_ppoll_time64
+416    32      io_pgetevents_time64    -                               sys_io_pgetevents
+417    32      recvmmsg_time64         -                               compat_sys_recvmmsg_time64
+418    32      mq_timedsend_time64     -                               sys_mq_timedsend
+419    32      mq_timedreceive_time64  -                               sys_mq_timedreceive
+420    32      semtimedop_time64       -                               sys_semtimedop
+421    32      rt_sigtimedwait_time64  -                               compat_sys_rt_sigtimedwait_time64
+422    32      futex_time64            -                               sys_futex
+423    32      sched_rr_get_interval_time64    -                       sys_sched_rr_get_interval

diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl
index 06d768c3cc4c592ebb537d48f12ed805dbd748a6..bfda678576e4335788f844db6ec7632fda5faedf 100644 (file)
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@ -406,3 +406,23 @@
 400    common  msgsnd                          sys_msgsnd
 401    common  msgrcv                          sys_msgrcv
 402    common  msgctl                          sys_msgctl
+403    common  clock_gettime64                 sys_clock_gettime
+404    common  clock_settime64                 sys_clock_settime
+405    common  clock_adjtime64                 sys_clock_adjtime
+406    common  clock_getres_time64             sys_clock_getres
+407    common  clock_nanosleep_time64          sys_clock_nanosleep
+408    common  timer_gettime64                 sys_timer_gettime
+409    common  timer_settime64                 sys_timer_settime
+410    common  timerfd_gettime64               sys_timerfd_gettime
+411    common  timerfd_settime64               sys_timerfd_settime
+412    common  utimensat_time64                sys_utimensat
+413    common  pselect6_time64                 sys_pselect6
+414    common  ppoll_time64                    sys_ppoll
+416    common  io_pgetevents_time64            sys_io_pgetevents
+417    common  recvmmsg_time64                 sys_recvmmsg
+418    common  mq_timedsend_time64             sys_mq_timedsend
+419    common  mq_timedreceive_time64          sys_mq_timedreceive
+420    common  semtimedop_time64               sys_semtimedop
+421    common  rt_sigtimedwait_time64          sys_rt_sigtimedwait
+422    common  futex_time64                    sys_futex
+423    common  sched_rr_get_interval_time64    sys_sched_rr_get_interval

diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl
index 99c40abd8878e1ea6dac5538b8ea10d86d2c9071..b9a5a04b2d2c543791088b69aae612ed56a97e5e 100644 (file)
--- a/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@ -449,3 +449,23 @@
 400    common  msgsnd                  sys_msgsnd                      compat_sys_msgsnd
 401    common  msgrcv                  sys_msgrcv                      compat_sys_msgrcv
 402    common  msgctl                  sys_msgctl                      compat_sys_msgctl
+403    32      clock_gettime64                 sys_clock_gettime               sys_clock_gettime
+404    32      clock_settime64                 sys_clock_settime               sys_clock_settime
+405    32      clock_adjtime64                 sys_clock_adjtime               sys_clock_adjtime
+406    32      clock_getres_time64             sys_clock_getres                sys_clock_getres
+407    32      clock_nanosleep_time64          sys_clock_nanosleep             sys_clock_nanosleep
+408    32      timer_gettime64                 sys_timer_gettime               sys_timer_gettime
+409    32      timer_settime64                 sys_timer_settime               sys_timer_settime
+410    32      timerfd_gettime64               sys_timerfd_gettime             sys_timerfd_gettime
+411    32      timerfd_settime64               sys_timerfd_settime             sys_timerfd_settime
+412    32      utimensat_time64                sys_utimensat                   sys_utimensat
+413    32      pselect6_time64                 sys_pselect6                    compat_sys_pselect6_time64
+414    32      ppoll_time64                    sys_ppoll                       compat_sys_ppoll_time64
+416    32      io_pgetevents_time64            sys_io_pgetevents               sys_io_pgetevents
+417    32      recvmmsg_time64                 sys_recvmmsg                    compat_sys_recvmmsg_time64
+418    32      mq_timedsend_time64             sys_mq_timedsend                sys_mq_timedsend
+419    32      mq_timedreceive_time64          sys_mq_timedreceive             sys_mq_timedreceive
+420    32      semtimedop_time64               sys_semtimedop                  sys_semtimedop
+421    32      rt_sigtimedwait_time64          sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait_time64
+422    32      futex_time64                    sys_futex                       sys_futex
+423    32      sched_rr_get_interval_time64    sys_sched_rr_get_interval       sys_sched_rr_get_interval

diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 8c47c1191a53ec7dc5445ff3d3b31aeda5198b9f..955ab6a3b61f5c1d6e8873187b1ea6e73ad71933 100644 (file)
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -409,3 +409,23 @@
 400    i386    msgsnd                  sys_msgsnd                      __ia32_compat_sys_msgsnd
 401    i386    msgrcv                  sys_msgrcv                      __ia32_compat_sys_msgrcv
 402    i386    msgctl                  sys_msgctl                      __ia32_compat_sys_msgctl
+403    i386    clock_gettime64         sys_clock_gettime               __ia32_sys_clock_gettime
+404    i386    clock_settime64         sys_clock_settime               __ia32_sys_clock_settime
+405    i386    clock_adjtime64         sys_clock_adjtime               __ia32_sys_clock_adjtime
+406    i386    clock_getres_time64     sys_clock_getres                __ia32_sys_clock_getres
+407    i386    clock_nanosleep_time64  sys_clock_nanosleep             __ia32_sys_clock_nanosleep
+408    i386    timer_gettime64         sys_timer_gettime               __ia32_sys_timer_gettime
+409    i386    timer_settime64         sys_timer_settime               __ia32_sys_timer_settime
+410    i386    timerfd_gettime64       sys_timerfd_gettime             __ia32_sys_timerfd_gettime
+411    i386    timerfd_settime64       sys_timerfd_settime             __ia32_sys_timerfd_settime
+412    i386    utimensat_time64        sys_utimensat                   __ia32_sys_utimensat
+413    i386    pselect6_time64         sys_pselect6                    __ia32_compat_sys_pselect6_time64
+414    i386    ppoll_time64            sys_ppoll                       __ia32_compat_sys_ppoll_time64
+416    i386    io_pgetevents_time64    sys_io_pgetevents               __ia32_sys_io_pgetevents
+417    i386    recvmmsg_time64         sys_recvmmsg                    __ia32_compat_sys_recvmmsg_time64
+418    i386    mq_timedsend_time64     sys_mq_timedsend                __ia32_sys_mq_timedsend
+419    i386    mq_timedreceive_time64  sys_mq_timedreceive             __ia32_sys_mq_timedreceive
+420    i386    semtimedop_time64       sys_semtimedop                  __ia32_sys_semtimedop
+421    i386    rt_sigtimedwait_time64  sys_rt_sigtimedwait             __ia32_compat_sys_rt_sigtimedwait_time64
+422    i386    futex_time64            sys_futex                       __ia32_sys_futex
+423    i386    sched_rr_get_interval_time64    sys_sched_rr_get_interval       __ia32_sys_sched_rr_get_interval

diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl
index 482673389e215f95a2bc7d12a90e9e60095f6bfb..6af49929de857b24f9ddb134ef79efd0f7c08e72 100644 (file)
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@ -373,3 +373,24 @@
 350    common  pkey_free                       sys_pkey_free
 351    common  statx                           sys_statx
 352    common  rseq                            sys_rseq
+# 353 through 402 are unassigned to sync up with generic numbers
+403    common  clock_gettime64                 sys_clock_gettime
+404    common  clock_settime64                 sys_clock_settime
+405    common  clock_adjtime64                 sys_clock_adjtime
+406    common  clock_getres_time64             sys_clock_getres
+407    common  clock_nanosleep_time64          sys_clock_nanosleep
+408    common  timer_gettime64                 sys_timer_gettime
+409    common  timer_settime64                 sys_timer_settime
+410    common  timerfd_gettime64               sys_timerfd_gettime
+411    common  timerfd_settime64               sys_timerfd_settime
+412    common  utimensat_time64                sys_utimensat
+413    common  pselect6_time64                 sys_pselect6
+414    common  ppoll_time64                    sys_ppoll
+416    common  io_pgetevents_time64            sys_io_pgetevents
+417    common  recvmmsg_time64                 sys_recvmmsg
+418    common  mq_timedsend_time64             sys_mq_timedsend
+419    common  mq_timedreceive_time64          sys_mq_timedreceive
+420    common  semtimedop_time64               sys_semtimedop
+421    common  rt_sigtimedwait_time64          sys_rt_sigtimedwait
+422    common  futex_time64                    sys_futex
+423    common  sched_rr_get_interval_time64    sys_sched_rr_get_interval

diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index ab18317690305d17acab7dfb2c56a2323e371383..acf9a07ab2ff97ce301ba301e40de2ef85101edb 100644 (file)
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -741,9 +741,51 @@ __SYSCALL(__NR_rseq, sys_rseq)
 #define __NR_kexec_file_load 294
 __SYSCALL(__NR_kexec_file_load,     sys_kexec_file_load)
 /* 295 through 402 are unassigned to sync up with generic numbers, don't use */
+#if __BITS_PER_LONG == 32
+#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
+__SC_COMP(__NR_pselect6_time64, sys_pselect6, compat_sys_pselect6_time64)
+#define __NR_ppoll_time64 414
+__SC_COMP(__NR_ppoll_time64, sys_ppoll, compat_sys_ppoll_time64)
+#define __NR_io_pgetevents_time64 416
+__SYSCALL(__NR_io_pgetevents_time64, sys_io_pgetevents)
+#define __NR_recvmmsg_time64 417
+__SC_COMP(__NR_recvmmsg_time64, sys_recvmmsg, 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
+__SC_COMP(__NR_rt_sigtimedwait_time64, sys_rt_sigtimedwait, 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)
+#endif
 
 #undef __NR_syscalls
-#define __NR_syscalls 295
+#define __NR_syscalls 424
 
 /*
  * 32 bit systems traditionally used different

diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index cf931003395fc95952f646891b903dfc2da7c45f..cc70a64fa81f34ef97903e56640d1b6cb9b47d29 100755 (executable)
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -84,6 +84,26 @@ cat << EOF
 #define __IGNORE_statfs64
 #define __IGNORE_llseek
 #define __IGNORE_mmap2
+#define __IGNORE_clock_gettime64
+#define __IGNORE_clock_settime64
+#define __IGNORE_clock_adjtime64
+#define __IGNORE_clock_getres_time64
+#define __IGNORE_clock_nanosleep_time64
+#define __IGNORE_timer_gettime64
+#define __IGNORE_timer_settime64
+#define __IGNORE_timerfd_gettime64
+#define __IGNORE_timerfd_settime64
+#define __IGNORE_utimensat_time64
+#define __IGNORE_pselect6_time64
+#define __IGNORE_ppoll_time64
+#define __IGNORE_io_pgetevents_time64
+#define __IGNORE_recvmmsg_time64
+#define __IGNORE_mq_timedsend_time64
+#define __IGNORE_mq_timedreceive_time64
+#define __IGNORE_semtimedop_time64
+#define __IGNORE_rt_sigtimedwait_time64
+#define __IGNORE_futex_time64
+#define __IGNORE_sched_rr_get_interval_time64
 #else
 #define __IGNORE_sendfile
 #define __IGNORE_ftruncate
@@ -98,6 +118,26 @@ cat << EOF
 #define __IGNORE_statfs
 #define __IGNORE_lseek
 #define __IGNORE_mmap
+#define __IGNORE_clock_gettime
+#define __IGNORE_clock_settime
+#define __IGNORE_clock_adjtime
+#define __IGNORE_clock_getres
+#define __IGNORE_clock_nanosleep
+#define __IGNORE_timer_gettime
+#define __IGNORE_timer_settime
+#define __IGNORE_timerfd_gettime
+#define __IGNORE_timerfd_settime
+#define __IGNORE_utimensat
+#define __IGNORE_pselect6
+#define __IGNORE_ppoll
+#define __IGNORE_io_pgetevents
+#define __IGNORE_recvmmsg
+#define __IGNORE_mq_timedsend
+#define __IGNORE_mq_timedreceiv
+#define __IGNORE_semtimedop
+#define __IGNORE_rt_sigtimedwait
+#define __IGNORE_futex
+#define __IGNORE_sched_rr_get_interval
 #endif
 
 /* i386-specific or historical system calls */