Merge tag 'y2038-new-syscalls' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground into timers/2038

Pull y2038 - time64 system calls from Arnd Bergmann:

This series finally gets us to the point of having system calls with 64-bit
time_t on all architectures, after a long time of incremental preparation
patches.

There was actually one conversion that I missed during the summer,
i.e. Deepa's timex series, which I now updated based the 5.0-rc1 changes
and review comments.

The following system calls are now added on all 32-bit architectures using
the same system call numbers:

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

Each one of these corresponds directly to an existing system call that
includes a 'struct timespec' argument, or a structure containing a timespec
or (in case of clock_adjtime) timeval. Not included here are new versions
of getitimer/setitimer and getrusage/waitid, which are planned for the
future but only needed to make a consistent API rather than for correct
operation beyond y2038. These four system calls are based on 'timeval', and
it has not been finally decided what the replacement kernel interface will
use instead.

So far, I have done a lot of build testing across most architectures, which
has found a number of bugs. Runtime testing so far included testing LTP on
32-bit ARM with the existing system calls, to ensure we do not regress for
existing binaries, and a test with a 32-bit x86 build of LTP against a
modified version of the musl C library that has been adapted to the new
system call interface [3].  This library can be used for testing on all
architectures supported by musl-1.1.21, but it is not how the support is
getting integrated into the official musl release. Official musl support is
planned but will require more invasive changes to the library.

Link: https://lore.kernel.org/lkml/20190110162435.309262-1-arnd@arndb.de/T/
Link: https://lore.kernel.org/lkml/20190118161835.2259170-1-arnd@arndb.de/
Link: https://git.linaro.org/people/arnd/musl-y2038.git/ [2]

65 files changed, 1263 insertions, 713 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index 4cfb6de48f79..46db715a7f42 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -759,7 +759,7 @@ config 64BIT_TIME
           handling.
 
 config COMPAT_32BIT_TIME
-        def_bool (!64BIT && 64BIT_TIME) || COMPAT
+        def_bool !64BIT || COMPAT
         help
           This enables 32 bit time_t support in addition to 64 bit time_t support.
           This is relevant on all 32-bit architectures, and 64-bit architectures
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 792586038808..bf497b8b0ec6 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -1253,7 +1253,7 @@ struct timex32 {
 
 SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
 {
-        struct timex txc;
+        struct __kernel_timex txc;
         int ret;
 
         /* copy relevant bits of struct timex. */
@@ -1270,7 +1270,8 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
         if (copy_to_user(txc_p, &txc, offsetof(struct timex32, time)) ||
             (copy_to_user(&txc_p->tick, &txc.tick, sizeof(struct timex32) - 
                           offsetof(struct timex32, tick))) ||
-            (put_tv_to_tv32(&txc_p->time, &txc.time)))
+            (put_user(txc.time.tv_sec, &txc_p->time.tv_sec)) ||
+            (put_user(txc.time.tv_usec, &txc_p->time.tv_usec)))
           return -EFAULT;
 
         return ret;
diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl
index 340b88dd397e..63ed39cbd3bd 100644
--- 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/include/asm/unistd.h b/arch/arm/include/asm/unistd.h
index d713587dfcf4..7a39e77984ef 100644
--- a/arch/arm/include/asm/unistd.h
+++ b/arch/arm/include/asm/unistd.h
@@ -26,10 +26,10 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 #define __ARCH_WANT_SYS_OLD_MMAP
 #define __ARCH_WANT_SYS_OLD_SELECT
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_UTIME32
 
 #if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
-#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_TIME32
 #define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_ALARM
diff --git a/arch/arm/kernel/sys_oabi-compat.c b/arch/arm/kernel/sys_oabi-compat.c
index 92ab36f38795..acd054a42ba2 100644
--- a/arch/arm/kernel/sys_oabi-compat.c
+++ b/arch/arm/kernel/sys_oabi-compat.c
@@ -317,10 +317,10 @@ struct oabi_sembuf {
 asmlinkage long sys_oabi_semtimedop(int semid,
                                     struct oabi_sembuf __user *tsops,
                                     unsigned nsops,
-                                    const struct timespec __user *timeout)
+                                    const struct old_timespec32 __user *timeout)
 {
         struct sembuf *sops;
-        struct timespec local_timeout;
+        struct old_timespec32 local_timeout;
         long err;
         int i;
 
@@ -350,7 +350,7 @@ asmlinkage long sys_oabi_semtimedop(int semid,
         } else {
                 mm_segment_t fs = get_fs();
                 set_fs(KERNEL_DS);
-                err = sys_semtimedop(semid, sops, nsops, timeout);
+                err = sys_semtimedop_time32(semid, sops, nsops, timeout);
                 set_fs(fs);
         }
         kfree(sops);
@@ -375,7 +375,7 @@ asmlinkage int sys_oabi_ipc(uint call, int first, int second, int third,
                 return  sys_oabi_semtimedop(first,
                                             (struct oabi_sembuf __user *)ptr,
                                             second,
-                                            (const struct timespec __user *)fifth);
+                                            (const struct old_timespec32 __user *)fifth);
         default:
                 return sys_ipc(call, first, second, third, ptr, fifth);
         }
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl
index b54b7f2bc24a..9016f4081bb9 100644
--- a/arch/arm/tools/syscall.tbl
+++ b/arch/arm/tools/syscall.tbl
@@ -24,7 +24,7 @@
 10      common  unlink                  sys_unlink
 11      common  execve                  sys_execve
 12      common  chdir                   sys_chdir
-13      oabi    time                    sys_time
+13      oabi    time                    sys_time32
 14      common  mknod                   sys_mknod
 15      common  chmod                   sys_chmod
 16      common  lchown                  sys_lchown16
@@ -36,12 +36,12 @@
 22      oabi    umount                  sys_oldumount
 23      common  setuid                  sys_setuid16
 24      common  getuid                  sys_getuid16
-25      oabi    stime                   sys_stime
+25      oabi    stime                   sys_stime32
 26      common  ptrace                  sys_ptrace
 27      oabi    alarm                   sys_alarm
 # 28 was sys_fstat
 29      common  pause                   sys_pause
-30      oabi    utime                   sys_utime
+30      oabi    utime                   sys_utime32
 # 31 was sys_stty
 # 32 was sys_gtty
 33      common  access                  sys_access
@@ -137,7 +137,7 @@
 121     common  setdomainname           sys_setdomainname
 122     common  uname                   sys_newuname
 # 123 was sys_modify_ldt
-124     common  adjtimex                sys_adjtimex
+124     common  adjtimex                sys_adjtimex_time32
 125     common  mprotect                sys_mprotect
 126     common  sigprocmask             sys_sigprocmask
 # 127 was sys_create_module
@@ -174,8 +174,8 @@
 158     common  sched_yield             sys_sched_yield
 159     common  sched_get_priority_max  sys_sched_get_priority_max
 160     common  sched_get_priority_min  sys_sched_get_priority_min
-161     common  sched_rr_get_interval   sys_sched_rr_get_interval
-162     common  nanosleep               sys_nanosleep
+161     common  sched_rr_get_interval   sys_sched_rr_get_interval_time32
+162     common  nanosleep               sys_nanosleep_time32
 163     common  mremap                  sys_mremap
 164     common  setresuid               sys_setresuid16
 165     common  getresuid               sys_getresuid16
@@ -190,7 +190,7 @@
 174     common  rt_sigaction            sys_rt_sigaction
 175     common  rt_sigprocmask          sys_rt_sigprocmask
 176     common  rt_sigpending           sys_rt_sigpending
-177     common  rt_sigtimedwait         sys_rt_sigtimedwait
+177     common  rt_sigtimedwait         sys_rt_sigtimedwait_time32
 178     common  rt_sigqueueinfo         sys_rt_sigqueueinfo
 179     common  rt_sigsuspend           sys_rt_sigsuspend
 180     common  pread64                 sys_pread64             sys_oabi_pread64
@@ -254,12 +254,12 @@
 237     common  fremovexattr            sys_fremovexattr
 238     common  tkill                   sys_tkill
 239     common  sendfile64              sys_sendfile64
-240     common  futex                   sys_futex
+240     common  futex                   sys_futex_time32
 241     common  sched_setaffinity       sys_sched_setaffinity
 242     common  sched_getaffinity       sys_sched_getaffinity
 243     common  io_setup                sys_io_setup
 244     common  io_destroy              sys_io_destroy
-245     common  io_getevents            sys_io_getevents
+245     common  io_getevents            sys_io_getevents_time32
 246     common  io_submit               sys_io_submit
 247     common  io_cancel               sys_io_cancel
 248     common  exit_group              sys_exit_group
@@ -272,26 +272,26 @@
 # 255 for get_thread_area
 256     common  set_tid_address         sys_set_tid_address
 257     common  timer_create            sys_timer_create
-258     common  timer_settime           sys_timer_settime
-259     common  timer_gettime           sys_timer_gettime
+258     common  timer_settime           sys_timer_settime32
+259     common  timer_gettime           sys_timer_gettime32
 260     common  timer_getoverrun        sys_timer_getoverrun
 261     common  timer_delete            sys_timer_delete
-262     common  clock_settime           sys_clock_settime
-263     common  clock_gettime           sys_clock_gettime
-264     common  clock_getres            sys_clock_getres
-265     common  clock_nanosleep         sys_clock_nanosleep
+262     common  clock_settime           sys_clock_settime32
+263     common  clock_gettime           sys_clock_gettime32
+264     common  clock_getres            sys_clock_getres_time32
+265     common  clock_nanosleep         sys_clock_nanosleep_time32
 266     common  statfs64                sys_statfs64_wrapper
 267     common  fstatfs64               sys_fstatfs64_wrapper
 268     common  tgkill                  sys_tgkill
-269     common  utimes                  sys_utimes
+269     common  utimes                  sys_utimes_time32
 270     common  arm_fadvise64_64        sys_arm_fadvise64_64
 271     common  pciconfig_iobase        sys_pciconfig_iobase
 272     common  pciconfig_read          sys_pciconfig_read
 273     common  pciconfig_write         sys_pciconfig_write
 274     common  mq_open                 sys_mq_open
 275     common  mq_unlink               sys_mq_unlink
-276     common  mq_timedsend            sys_mq_timedsend
-277     common  mq_timedreceive         sys_mq_timedreceive
+276     common  mq_timedsend            sys_mq_timedsend_time32
+277     common  mq_timedreceive         sys_mq_timedreceive_time32
 278     common  mq_notify               sys_mq_notify
 279     common  mq_getsetattr           sys_mq_getsetattr
 280     common  waitid                  sys_waitid
@@ -326,7 +326,7 @@
 309     common  add_key                 sys_add_key
 310     common  request_key             sys_request_key
 311     common  keyctl                  sys_keyctl
-312     common  semtimedop              sys_semtimedop          sys_oabi_semtimedop
+312     common  semtimedop              sys_semtimedop_time32   sys_oabi_semtimedop
 313     common  vserver
 314     common  ioprio_set              sys_ioprio_set
 315     common  ioprio_get              sys_ioprio_get
@@ -340,7 +340,7 @@
 323     common  mkdirat                 sys_mkdirat
 324     common  mknodat                 sys_mknodat
 325     common  fchownat                sys_fchownat
-326     common  futimesat               sys_futimesat
+326     common  futimesat               sys_futimesat_time32
 327     common  fstatat64               sys_fstatat64           sys_oabi_fstatat64
 328     common  unlinkat                sys_unlinkat
 329     common  renameat                sys_renameat
@@ -349,8 +349,8 @@
 332     common  readlinkat              sys_readlinkat
 333     common  fchmodat                sys_fchmodat
 334     common  faccessat               sys_faccessat
-335     common  pselect6                sys_pselect6
-336     common  ppoll                   sys_ppoll
+335     common  pselect6                sys_pselect6_time32
+336     common  ppoll                   sys_ppoll_time32
 337     common  unshare                 sys_unshare
 338     common  set_robust_list         sys_set_robust_list
 339     common  get_robust_list         sys_get_robust_list
@@ -362,13 +362,13 @@
 345     common  getcpu                  sys_getcpu
 346     common  epoll_pwait             sys_epoll_pwait
 347     common  kexec_load              sys_kexec_load
-348     common  utimensat               sys_utimensat
+348     common  utimensat               sys_utimensat_time32
 349     common  signalfd                sys_signalfd
 350     common  timerfd_create          sys_timerfd_create
 351     common  eventfd                 sys_eventfd
 352     common  fallocate               sys_fallocate
-353     common  timerfd_settime         sys_timerfd_settime
-354     common  timerfd_gettime         sys_timerfd_gettime
+353     common  timerfd_settime         sys_timerfd_settime32
+354     common  timerfd_gettime         sys_timerfd_gettime32
 355     common  signalfd4               sys_signalfd4
 356     common  eventfd2                sys_eventfd2
 357     common  epoll_create1           sys_epoll_create1
@@ -379,14 +379,14 @@
 362     common  pwritev                 sys_pwritev
 363     common  rt_tgsigqueueinfo       sys_rt_tgsigqueueinfo
 364     common  perf_event_open         sys_perf_event_open
-365     common  recvmmsg                sys_recvmmsg
+365     common  recvmmsg                sys_recvmmsg_time32
 366     common  accept4                 sys_accept4
 367     common  fanotify_init           sys_fanotify_init
 368     common  fanotify_mark           sys_fanotify_mark
 369     common  prlimit64               sys_prlimit64
 370     common  name_to_handle_at       sys_name_to_handle_at
 371     common  open_by_handle_at       sys_open_by_handle_at
-372     common  clock_adjtime           sys_clock_adjtime
+372     common  clock_adjtime           sys_clock_adjtime32
 373     common  syncfs                  sys_syncfs
 374     common  sendmmsg                sys_sendmmsg
 375     common  setns                   sys_setns
@@ -413,6 +413,27 @@
 396     common  pkey_free               sys_pkey_free
 397     common  statx                   sys_statx
 398     common  rseq                    sys_rseq
-399     common  io_pgetevents           sys_io_pgetevents
+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 2c30e6f145ff..d1dd93436e1e 100644
--- 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 d10cce69a4b0..5590f2623690 100644
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@ -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
@@ -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
@@ -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 52319006de0d..ab9cda5f6136 100644
--- 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/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index 49d5de18646b..2e0047cf86f8 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -15,8 +15,8 @@
 #define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_TIME32
+#define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
 #define __ARCH_WANT_SYS_FADVISE64
diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl
index bffffb202f8a..125c14178979 100644
--- a/arch/m68k/kernel/syscalls/syscall.tbl
+++ b/arch/m68k/kernel/syscalls/syscall.tbl
@@ -20,7 +20,7 @@
 10      common  unlink                          sys_unlink
 11      common  execve                          sys_execve
 12      common  chdir                           sys_chdir
-13      common  time                            sys_time
+13      common  time                            sys_time32
 14      common  mknod                           sys_mknod
 15      common  chmod                           sys_chmod
 16      common  chown                           sys_chown16
@@ -32,12 +32,12 @@
 22      common  umount                          sys_oldumount
 23      common  setuid                          sys_setuid16
 24      common  getuid                          sys_getuid16
-25      common  stime                           sys_stime
+25      common  stime                           sys_stime32
 26      common  ptrace                          sys_ptrace
 27      common  alarm                           sys_alarm
 28      common  oldfstat                        sys_fstat
 29      common  pause                           sys_pause
-30      common  utime                           sys_utime
+30      common  utime                           sys_utime32
 # 31 was stty
 # 32 was gtty
 33      common  access                          sys_access
@@ -131,7 +131,7 @@
 121     common  setdomainname                   sys_setdomainname
 122     common  uname                           sys_newuname
 123     common  cacheflush                      sys_cacheflush
-124     common  adjtimex                        sys_adjtimex
+124     common  adjtimex                        sys_adjtimex_time32
 125     common  mprotect                        sys_mprotect
 126     common  sigprocmask                     sys_sigprocmask
 127     common  create_module                   sys_ni_syscall
@@ -168,8 +168,8 @@
 158     common  sched_yield                     sys_sched_yield
 159     common  sched_get_priority_max          sys_sched_get_priority_max
 160     common  sched_get_priority_min          sys_sched_get_priority_min
-161     common  sched_rr_get_interval           sys_sched_rr_get_interval
-162     common  nanosleep                       sys_nanosleep
+161     common  sched_rr_get_interval           sys_sched_rr_get_interval_time32
+162     common  nanosleep                       sys_nanosleep_time32
 163     common  mremap                          sys_mremap
 164     common  setresuid                       sys_setresuid16
 165     common  getresuid                       sys_getresuid16
@@ -184,7 +184,7 @@
 174     common  rt_sigaction                    sys_rt_sigaction
 175     common  rt_sigprocmask                  sys_rt_sigprocmask
 176     common  rt_sigpending                   sys_rt_sigpending
-177     common  rt_sigtimedwait                 sys_rt_sigtimedwait
+177     common  rt_sigtimedwait                 sys_rt_sigtimedwait_time32
 178     common  rt_sigqueueinfo                 sys_rt_sigqueueinfo
 179     common  rt_sigsuspend                   sys_rt_sigsuspend
 180     common  pread64                         sys_pread64
@@ -242,7 +242,7 @@
 232     common  removexattr                     sys_removexattr
 233     common  lremovexattr                    sys_lremovexattr
 234     common  fremovexattr                    sys_fremovexattr
-235     common  futex                           sys_futex
+235     common  futex                           sys_futex_time32
 236     common  sendfile64                      sys_sendfile64
 237     common  mincore                         sys_mincore
 238     common  madvise                         sys_madvise
@@ -250,7 +250,7 @@
 240     common  readahead                       sys_readahead
 241     common  io_setup                        sys_io_setup
 242     common  io_destroy                      sys_io_destroy
-243     common  io_getevents                    sys_io_getevents
+243     common  io_getevents                    sys_io_getevents_time32
 244     common  io_submit                       sys_io_submit
 245     common  io_cancel                       sys_io_cancel
 246     common  fadvise64                       sys_fadvise64
@@ -262,26 +262,26 @@
 252     common  remap_file_pages                sys_remap_file_pages
 253     common  set_tid_address                 sys_set_tid_address
 254     common  timer_create                    sys_timer_create
-255     common  timer_settime                   sys_timer_settime
-256     common  timer_gettime                   sys_timer_gettime
+255     common  timer_settime                   sys_timer_settime32
+256     common  timer_gettime                   sys_timer_gettime32
 257     common  timer_getoverrun                sys_timer_getoverrun
 258     common  timer_delete                    sys_timer_delete
-259     common  clock_settime                   sys_clock_settime
-260     common  clock_gettime                   sys_clock_gettime
-261     common  clock_getres                    sys_clock_getres
-262     common  clock_nanosleep                 sys_clock_nanosleep
+259     common  clock_settime                   sys_clock_settime32
+260     common  clock_gettime                   sys_clock_gettime32
+261     common  clock_getres                    sys_clock_getres_time32
+262     common  clock_nanosleep                 sys_clock_nanosleep_time32
 263     common  statfs64                        sys_statfs64
 264     common  fstatfs64                       sys_fstatfs64
 265     common  tgkill                          sys_tgkill
-266     common  utimes                          sys_utimes
+266     common  utimes                          sys_utimes_time32
 267     common  fadvise64_64                    sys_fadvise64_64
 268     common  mbind                           sys_mbind
 269     common  get_mempolicy                   sys_get_mempolicy
 270     common  set_mempolicy                   sys_set_mempolicy
 271     common  mq_open                         sys_mq_open
 272     common  mq_unlink                       sys_mq_unlink
-273     common  mq_timedsend                    sys_mq_timedsend
-274     common  mq_timedreceive                 sys_mq_timedreceive
+273     common  mq_timedsend                    sys_mq_timedsend_time32
+274     common  mq_timedreceive                 sys_mq_timedreceive_time32
 275     common  mq_notify                       sys_mq_notify
 276     common  mq_getsetattr                   sys_mq_getsetattr
 277     common  waitid                          sys_waitid
@@ -299,7 +299,7 @@
 289     common  mkdirat                         sys_mkdirat
 290     common  mknodat                         sys_mknodat
 291     common  fchownat                        sys_fchownat
-292     common  futimesat                       sys_futimesat
+292     common  futimesat                       sys_futimesat_time32
 293     common  fstatat64                       sys_fstatat64
 294     common  unlinkat                        sys_unlinkat
 295     common  renameat                        sys_renameat
@@ -308,8 +308,8 @@
 298     common  readlinkat                      sys_readlinkat
 299     common  fchmodat                        sys_fchmodat
 300     common  faccessat                       sys_faccessat
-301     common  pselect6                        sys_pselect6
-302     common  ppoll                           sys_ppoll
+301     common  pselect6                        sys_pselect6_time32
+302     common  ppoll                           sys_ppoll_time32
 303     common  unshare                         sys_unshare
 304     common  set_robust_list                 sys_set_robust_list
 305     common  get_robust_list                 sys_get_robust_list
@@ -323,13 +323,13 @@
 313     common  kexec_load                      sys_kexec_load
 314     common  getcpu                          sys_getcpu
 315     common  epoll_pwait                     sys_epoll_pwait
-316     common  utimensat                       sys_utimensat
+316     common  utimensat                       sys_utimensat_time32
 317     common  signalfd                        sys_signalfd
 318     common  timerfd_create                  sys_timerfd_create
 319     common  eventfd                         sys_eventfd
 320     common  fallocate                       sys_fallocate
-321     common  timerfd_settime                 sys_timerfd_settime
-322     common  timerfd_gettime                 sys_timerfd_gettime
+321     common  timerfd_settime                 sys_timerfd_settime32
+322     common  timerfd_gettime                 sys_timerfd_gettime32
 323     common  signalfd4                       sys_signalfd4
 324     common  eventfd2                        sys_eventfd2
 325     common  epoll_create1                   sys_epoll_create1
@@ -349,7 +349,7 @@
 339     common  prlimit64                       sys_prlimit64
 340     common  name_to_handle_at               sys_name_to_handle_at
 341     common  open_by_handle_at               sys_open_by_handle_at
-342     common  clock_adjtime                   sys_clock_adjtime
+342     common  clock_adjtime                   sys_clock_adjtime32
 343     common  syncfs                          sys_syncfs
 344     common  setns                           sys_setns
 345     common  process_vm_readv                sys_process_vm_readv
@@ -378,7 +378,7 @@
 368     common  recvfrom                        sys_recvfrom
 369     common  recvmsg                         sys_recvmsg
 370     common  shutdown                        sys_shutdown
-371     common  recvmmsg                        sys_recvmmsg
+371     common  recvmmsg                        sys_recvmmsg_time32
 372     common  sendmmsg                        sys_sendmmsg
 373     common  userfaultfd                     sys_userfaultfd
 374     common  membarrier                      sys_membarrier
@@ -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/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h
index 9b7c2c4eaf12..d79d35ac6253 100644
--- a/arch/microblaze/include/asm/unistd.h
+++ b/arch/microblaze/include/asm/unistd.h
@@ -21,8 +21,8 @@
 #define __ARCH_WANT_SYS_GETHOSTNAME
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_TIME32
+#define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
 #define __ARCH_WANT_SYS_FADVISE64
diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl
index 7cc0f9554da3..8ee3a8c18498 100644
--- a/arch/microblaze/kernel/syscalls/syscall.tbl
+++ b/arch/microblaze/kernel/syscalls/syscall.tbl
@@ -20,7 +20,7 @@
 10      common  unlink                          sys_unlink
 11      common  execve                          sys_execve
 12      common  chdir                           sys_chdir
-13      common  time                            sys_time
+13      common  time                            sys_time32
 14      common  mknod                           sys_mknod
 15      common  chmod                           sys_chmod
 16      common  lchown                          sys_lchown
@@ -32,12 +32,12 @@
 22      common  umount                          sys_oldumount
 23      common  setuid                          sys_setuid
 24      common  getuid                          sys_getuid
-25      common  stime                           sys_stime
+25      common  stime                           sys_stime32
 26      common  ptrace                          sys_ptrace
 27      common  alarm                           sys_alarm
 28      common  oldfstat                        sys_ni_syscall
 29      common  pause                           sys_pause
-30      common  utime                           sys_utime
+30      common  utime                           sys_utime32
 31      common  stty                            sys_ni_syscall
 32      common  gtty                            sys_ni_syscall
 33      common  access                          sys_access
@@ -131,7 +131,7 @@
 121     common  setdomainname                   sys_setdomainname
 122     common  uname                           sys_newuname
 123     common  modify_ldt                      sys_ni_syscall
-124     common  adjtimex                        sys_adjtimex
+124     common  adjtimex                        sys_adjtimex_time32
 125     common  mprotect                        sys_mprotect
 126     common  sigprocmask                     sys_sigprocmask
 127     common  create_module                   sys_ni_syscall
@@ -168,8 +168,8 @@
 158     common  sched_yield                     sys_sched_yield
 159     common  sched_get_priority_max          sys_sched_get_priority_max
 160     common  sched_get_priority_min          sys_sched_get_priority_min
-161     common  sched_rr_get_interval           sys_sched_rr_get_interval
-162     common  nanosleep                       sys_nanosleep
+161     common  sched_rr_get_interval           sys_sched_rr_get_interval_time32
+162     common  nanosleep                       sys_nanosleep_time32
 163     common  mremap                          sys_mremap
 164     common  setresuid                       sys_setresuid
 165     common  getresuid                       sys_getresuid
@@ -184,7 +184,7 @@
 174     common  rt_sigaction                    sys_rt_sigaction
 175     common  rt_sigprocmask                  sys_rt_sigprocmask
 176     common  rt_sigpending                   sys_rt_sigpending
-177     common  rt_sigtimedwait                 sys_rt_sigtimedwait
+177     common  rt_sigtimedwait                 sys_rt_sigtimedwait_time32
 178     common  rt_sigqueueinfo                 sys_rt_sigqueueinfo
 179     common  rt_sigsuspend                   sys_rt_sigsuspend
 180     common  pread64                         sys_pread64
@@ -247,14 +247,14 @@
 237     common  fremovexattr                    sys_fremovexattr
 238     common  tkill                           sys_tkill
 239     common  sendfile64                      sys_sendfile64
-240     common  futex                           sys_futex
+240     common  futex                           sys_futex_time32
 241     common  sched_setaffinity               sys_sched_setaffinity
 242     common  sched_getaffinity               sys_sched_getaffinity
 243     common  set_thread_area                 sys_ni_syscall
 244     common  get_thread_area                 sys_ni_syscall
 245     common  io_setup                        sys_io_setup
 246     common  io_destroy                      sys_io_destroy
-247     common  io_getevents                    sys_io_getevents
+247     common  io_getevents                    sys_io_getevents_time32
 248     common  io_submit                       sys_io_submit
 249     common  io_cancel                       sys_io_cancel
 250     common  fadvise64                       sys_fadvise64
@@ -267,18 +267,18 @@
 257     common  remap_file_pages                sys_remap_file_pages
 258     common  set_tid_address                 sys_set_tid_address
 259     common  timer_create                    sys_timer_create
-260     common  timer_settime                   sys_timer_settime
-261     common  timer_gettime                   sys_timer_gettime
+260     common  timer_settime                   sys_timer_settime32
+261     common  timer_gettime                   sys_timer_gettime32
 262     common  timer_getoverrun                sys_timer_getoverrun
 263     common  timer_delete                    sys_timer_delete
-264     common  clock_settime                   sys_clock_settime
-265     common  clock_gettime                   sys_clock_gettime
-266     common  clock_getres                    sys_clock_getres
-267     common  clock_nanosleep                 sys_clock_nanosleep
+264     common  clock_settime                   sys_clock_settime32
+265     common  clock_gettime                   sys_clock_gettime32
+266     common  clock_getres                    sys_clock_getres_time32
+267     common  clock_nanosleep                 sys_clock_nanosleep_time32
 268     common  statfs64                        sys_statfs64
 269     common  fstatfs64                       sys_fstatfs64
 270     common  tgkill                          sys_tgkill
-271     common  utimes                          sys_utimes
+271     common  utimes                          sys_utimes_time32
 272     common  fadvise64_64                    sys_fadvise64_64
 273     common  vserver                         sys_ni_syscall
 274     common  mbind                           sys_mbind
@@ -286,8 +286,8 @@
 276     common  set_mempolicy                   sys_set_mempolicy
 277     common  mq_open                         sys_mq_open
 278     common  mq_unlink                       sys_mq_unlink
-279     common  mq_timedsend                    sys_mq_timedsend
-280     common  mq_timedreceive                 sys_mq_timedreceive
+279     common  mq_timedsend                    sys_mq_timedsend_time32
+280     common  mq_timedreceive                 sys_mq_timedreceive_time32
 281     common  mq_notify                       sys_mq_notify
 282     common  mq_getsetattr                   sys_mq_getsetattr
 283     common  kexec_load                      sys_kexec_load
@@ -306,7 +306,7 @@
 296     common  mkdirat                         sys_mkdirat
 297     common  mknodat                         sys_mknodat
 298     common  fchownat                        sys_fchownat
-299     common  futimesat                       sys_futimesat
+299     common  futimesat                       sys_futimesat_time32
 300     common  fstatat64                       sys_fstatat64
 301     common  unlinkat                        sys_unlinkat
 302     common  renameat                        sys_renameat
@@ -315,8 +315,8 @@
 305     common  readlinkat                      sys_readlinkat
 306     common  fchmodat                        sys_fchmodat
 307     common  faccessat                       sys_faccessat
-308     common  pselect6                        sys_pselect6
-309     common  ppoll                           sys_ppoll
+308     common  pselect6                        sys_pselect6_time32
+309     common  ppoll                           sys_ppoll_time32
 310     common  unshare                         sys_unshare
 311     common  set_robust_list                 sys_set_robust_list
 312     common  get_robust_list                 sys_get_robust_list
@@ -327,14 +327,14 @@
 317     common  move_pages                      sys_move_pages
 318     common  getcpu                          sys_getcpu
 319     common  epoll_pwait                     sys_epoll_pwait
-320     common  utimensat                       sys_utimensat
+320     common  utimensat                       sys_utimensat_time32
 321     common  signalfd                        sys_signalfd
 322     common  timerfd_create                  sys_timerfd_create
 323     common  eventfd                         sys_eventfd
 324     common  fallocate                       sys_fallocate
-325     common  semtimedop                      sys_semtimedop
-326     common  timerfd_settime                 sys_timerfd_settime
-327     common  timerfd_gettime                 sys_timerfd_gettime
+325     common  semtimedop                      sys_semtimedop_time32
+326     common  timerfd_settime                 sys_timerfd_settime32
+327     common  timerfd_gettime                 sys_timerfd_gettime32
 328     common  semctl                          sys_old_semctl
 329     common  semget                          sys_semget
 330     common  semop                           sys_semop
@@ -374,13 +374,13 @@
 364     common  pwritev                         sys_pwritev
 365     common  rt_tgsigqueueinfo               sys_rt_tgsigqueueinfo
 366     common  perf_event_open                 sys_perf_event_open
-367     common  recvmmsg                        sys_recvmmsg
+367     common  recvmmsg                        sys_recvmmsg_time32
 368     common  fanotify_init                   sys_fanotify_init
 369     common  fanotify_mark                   sys_fanotify_mark
 370     common  prlimit64                       sys_prlimit64
 371     common  name_to_handle_at               sys_name_to_handle_at
 372     common  open_by_handle_at               sys_open_by_handle_at
-373     common  clock_adjtime                   sys_clock_adjtime
+373     common  clock_adjtime                   sys_clock_adjtime32
 374     common  syncfs                          sys_syncfs
 375     common  setns                           sys_setns
 376     common  sendmmsg                        sys_sendmmsg
@@ -406,5 +406,26 @@
 396     common  pkey_alloc                      sys_pkey_alloc
 397     common  pkey_free                       sys_pkey_free
 398     common  statx                           sys_statx
-399     common  io_pgetevents                   sys_io_pgetevents
+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/include/asm/unistd.h b/arch/mips/include/asm/unistd.h
index 75c590229a23..071053ece677 100644
--- a/arch/mips/include/asm/unistd.h
+++ b/arch/mips/include/asm/unistd.h
@@ -45,10 +45,10 @@
 #define __ARCH_WANT_SYS_SIGPROCMASK
 # ifdef CONFIG_32BIT
 #  define __ARCH_WANT_STAT64
-#  define __ARCH_WANT_SYS_TIME
+#  define __ARCH_WANT_SYS_TIME32
 # endif
 # ifdef CONFIG_MIPS32_O32
-#  define __ARCH_WANT_COMPAT_SYS_TIME
+#  define __ARCH_WANT_SYS_TIME32
 # endif
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_SYS_CLONE
diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl
index cc134b1211aa..15f4117900ee 100644
--- a/arch/mips/kernel/syscalls/syscall_n32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_n32.tbl
@@ -41,7 +41,7 @@
 31      n32     dup                             sys_dup
 32      n32     dup2                            sys_dup2
 33      n32     pause                           sys_pause
-34      n32     nanosleep                       compat_sys_nanosleep
+34      n32     nanosleep                       sys_nanosleep_time32
 35      n32     getitimer                       compat_sys_getitimer
 36      n32     setitimer                       compat_sys_setitimer
 37      n32     alarm                           sys_alarm
@@ -133,11 +133,11 @@
 123     n32     capget                          sys_capget
 124     n32     capset                          sys_capset
 125     n32     rt_sigpending                   compat_sys_rt_sigpending
-126     n32     rt_sigtimedwait                 compat_sys_rt_sigtimedwait
+126     n32     rt_sigtimedwait                 compat_sys_rt_sigtimedwait_time32
 127     n32     rt_sigqueueinfo                 compat_sys_rt_sigqueueinfo
 128     n32     rt_sigsuspend                   compat_sys_rt_sigsuspend
 129     n32     sigaltstack                     compat_sys_sigaltstack
-130     n32     utime                           compat_sys_utime
+130     n32     utime                           sys_utime32
 131     n32     mknod                           sys_mknod
 132     n32     personality                     sys_32_personality
 133     n32     ustat                           compat_sys_ustat
@@ -152,7 +152,7 @@
 142     n32     sched_getscheduler              sys_sched_getscheduler
 143     n32     sched_get_priority_max          sys_sched_get_priority_max
 144     n32     sched_get_priority_min          sys_sched_get_priority_min
-145     n32     sched_rr_get_interval           compat_sys_sched_rr_get_interval
+145     n32     sched_rr_get_interval           sys_sched_rr_get_interval_time32
 146     n32     mlock                           sys_mlock
 147     n32     munlock                         sys_munlock
 148     n32     mlockall                        sys_mlockall
@@ -161,7 +161,7 @@
 151     n32     pivot_root                      sys_pivot_root
 152     n32     _sysctl                         compat_sys_sysctl
 153     n32     prctl                           sys_prctl
-154     n32     adjtimex                        compat_sys_adjtimex
+154     n32     adjtimex                        sys_adjtimex_time32
 155     n32     setrlimit                       compat_sys_setrlimit
 156     n32     chroot                          sys_chroot
 157     n32     sync                            sys_sync
@@ -202,7 +202,7 @@
 191     n32     fremovexattr                    sys_fremovexattr
 192     n32     tkill                           sys_tkill
 193     n32     reserved193                     sys_ni_syscall
-194     n32     futex                           compat_sys_futex
+194     n32     futex                           sys_futex_time32
 195     n32     sched_setaffinity               compat_sys_sched_setaffinity
 196     n32     sched_getaffinity               compat_sys_sched_getaffinity
 197     n32     cacheflush                      sys_cacheflush
@@ -210,7 +210,7 @@
 199     n32     sysmips                         __sys_sysmips
 200     n32     io_setup                        compat_sys_io_setup
 201     n32     io_destroy                      sys_io_destroy
-202     n32     io_getevents                    compat_sys_io_getevents
+202     n32     io_getevents                    sys_io_getevents_time32
 203     n32     io_submit                       compat_sys_io_submit
 204     n32     io_cancel                       sys_io_cancel
 205     n32     exit_group                      sys_exit_group
@@ -223,29 +223,29 @@
 212     n32     fcntl64                         compat_sys_fcntl64
 213     n32     set_tid_address                 sys_set_tid_address
 214     n32     restart_syscall                 sys_restart_syscall
-215     n32     semtimedop                      compat_sys_semtimedop
+215     n32     semtimedop                      sys_semtimedop_time32
 216     n32     fadvise64                       sys_fadvise64_64
 217     n32     statfs64                        compat_sys_statfs64
 218     n32     fstatfs64                       compat_sys_fstatfs64
 219     n32     sendfile64                      sys_sendfile64
 220     n32     timer_create                    compat_sys_timer_create
-221     n32     timer_settime                   compat_sys_timer_settime
-222     n32     timer_gettime                   compat_sys_timer_gettime
+221     n32     timer_settime                   sys_timer_settime32
+222     n32     timer_gettime                   sys_timer_gettime32
 223     n32     timer_getoverrun                sys_timer_getoverrun
 224     n32     timer_delete                    sys_timer_delete
-225     n32     clock_settime                   compat_sys_clock_settime
-226     n32     clock_gettime                   compat_sys_clock_gettime
-227     n32     clock_getres                    compat_sys_clock_getres
-228     n32     clock_nanosleep                 compat_sys_clock_nanosleep
+225     n32     clock_settime                   sys_clock_settime32
+226     n32     clock_gettime                   sys_clock_gettime32
+227     n32     clock_getres                    sys_clock_getres_time32
+228     n32     clock_nanosleep                 sys_clock_nanosleep_time32
 229     n32     tgkill                          sys_tgkill
-230     n32     utimes                          compat_sys_utimes
+230     n32     utimes                          sys_utimes_time32
 231     n32     mbind                           compat_sys_mbind
 232     n32     get_mempolicy                   compat_sys_get_mempolicy
 233     n32     set_mempolicy                   compat_sys_set_mempolicy
 234     n32     mq_open                         compat_sys_mq_open
 235     n32     mq_unlink                       sys_mq_unlink
-236     n32     mq_timedsend                    compat_sys_mq_timedsend
-237     n32     mq_timedreceive                 compat_sys_mq_timedreceive
+236     n32     mq_timedsend                    sys_mq_timedsend_time32
+237     n32     mq_timedreceive                 sys_mq_timedreceive_time32
 238     n32     mq_notify                       compat_sys_mq_notify
 239     n32     mq_getsetattr                   compat_sys_mq_getsetattr
 240     n32     vserver                         sys_ni_syscall
@@ -263,7 +263,7 @@
 252     n32     mkdirat                         sys_mkdirat
 253     n32     mknodat                         sys_mknodat
 254     n32     fchownat                        sys_fchownat
-255     n32     futimesat                       compat_sys_futimesat
+255     n32     futimesat                       sys_futimesat_time32
 256     n32     newfstatat                      sys_newfstatat
 257     n32     unlinkat                        sys_unlinkat
 258     n32     renameat                        sys_renameat
@@ -272,8 +272,8 @@
 261     n32     readlinkat                      sys_readlinkat
 262     n32     fchmodat                        sys_fchmodat
 263     n32     faccessat                       sys_faccessat
-264     n32     pselect6                        compat_sys_pselect6
-265     n32     ppoll                           compat_sys_ppoll
+264     n32     pselect6                        compat_sys_pselect6_time32
+265     n32     ppoll                           compat_sys_ppoll_time32
 266     n32     unshare                         sys_unshare
 267     n32     splice                          sys_splice
 268     n32     sync_file_range                 sys_sync_file_range
@@ -287,14 +287,14 @@
 276     n32     epoll_pwait                     compat_sys_epoll_pwait
 277     n32     ioprio_set                      sys_ioprio_set
 278     n32     ioprio_get                      sys_ioprio_get
-279     n32     utimensat                       compat_sys_utimensat
+279     n32     utimensat                       sys_utimensat_time32
 280     n32     signalfd                        compat_sys_signalfd
 281     n32     timerfd                         sys_ni_syscall
 282     n32     eventfd                         sys_eventfd
 283     n32     fallocate                       sys_fallocate
 284     n32     timerfd_create                  sys_timerfd_create
-285     n32     timerfd_gettime                 compat_sys_timerfd_gettime
-286     n32     timerfd_settime                 compat_sys_timerfd_settime
+285     n32     timerfd_gettime                 sys_timerfd_gettime32
+286     n32     timerfd_settime                 sys_timerfd_settime32
 287     n32     signalfd4                       compat_sys_signalfd4
 288     n32     eventfd2                        sys_eventfd2
 289     n32     epoll_create1                   sys_epoll_create1
@@ -306,14 +306,14 @@
 295     n32     rt_tgsigqueueinfo               compat_sys_rt_tgsigqueueinfo
 296     n32     perf_event_open                 sys_perf_event_open
 297     n32     accept4                         sys_accept4
-298     n32     recvmmsg                        compat_sys_recvmmsg
+298     n32     recvmmsg                        compat_sys_recvmmsg_time32
 299     n32     getdents64                      sys_getdents64
 300     n32     fanotify_init                   sys_fanotify_init
 301     n32     fanotify_mark                   sys_fanotify_mark
 302     n32     prlimit64                       sys_prlimit64
 303     n32     name_to_handle_at               sys_name_to_handle_at
 304     n32     open_by_handle_at               sys_open_by_handle_at
-305     n32     clock_adjtime                   compat_sys_clock_adjtime
+305     n32     clock_adjtime                   sys_clock_adjtime32
 306     n32     syncfs                          sys_syncfs
 307     n32     sendmmsg                        compat_sys_sendmmsg
 308     n32     setns                           sys_setns
@@ -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 af0da757a7b2..c85502e67b44 100644
--- 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 fa47ea8cc6ef..2e063d0f837e 100644
--- a/arch/mips/kernel/syscalls/syscall_o32.tbl
+++ b/arch/mips/kernel/syscalls/syscall_o32.tbl
@@ -20,7 +20,7 @@
 10      o32     unlink                          sys_unlink
 11      o32     execve                          sys_execve                      compat_sys_execve
 12      o32     chdir                           sys_chdir
-13      o32     time                            sys_time                        compat_sys_time
+13      o32     time                            sys_time32
 14      o32     mknod                           sys_mknod
 15      o32     chmod                           sys_chmod
 16      o32     lchown                          sys_lchown
@@ -33,13 +33,13 @@
 22      o32     umount                          sys_oldumount
 23      o32     setuid                          sys_setuid
 24      o32     getuid                          sys_getuid
-25      o32     stime                           sys_stime                       compat_sys_stime
+25      o32     stime                           sys_stime32
 26      o32     ptrace                          sys_ptrace                      compat_sys_ptrace
 27      o32     alarm                           sys_alarm
 # 28 was sys_fstat
 28      o32     unused28                        sys_ni_syscall
 29      o32     pause                           sys_pause
-30      o32     utime                           sys_utime                       compat_sys_utime
+30      o32     utime                           sys_utime32
 31      o32     stty                            sys_ni_syscall
 32      o32     gtty                            sys_ni_syscall
 33      o32     access                          sys_access
@@ -135,7 +135,7 @@
 121     o32     setdomainname                   sys_setdomainname
 122     o32     uname                           sys_newuname
 123     o32     modify_ldt                      sys_ni_syscall
-124     o32     adjtimex                        sys_adjtimex                    compat_sys_adjtimex
+124     o32     adjtimex                        sys_adjtimex_time32
 125     o32     mprotect                        sys_mprotect
 126     o32     sigprocmask                     sys_sigprocmask                 compat_sys_sigprocmask
 127     o32     create_module                   sys_ni_syscall
@@ -176,8 +176,8 @@
 162     o32     sched_yield                     sys_sched_yield
 163     o32     sched_get_priority_max          sys_sched_get_priority_max
 164     o32     sched_get_priority_min          sys_sched_get_priority_min
-165     o32     sched_rr_get_interval           sys_sched_rr_get_interval       compat_sys_sched_rr_get_interval
-166     o32     nanosleep                       sys_nanosleep                   compat_sys_nanosleep
+165     o32     sched_rr_get_interval           sys_sched_rr_get_interval_time32
+166     o32     nanosleep                       sys_nanosleep_time32
 167     o32     mremap                          sys_mremap
 168     o32     accept                          sys_accept
 169     o32     bind                            sys_bind
@@ -208,7 +208,7 @@
 194     o32     rt_sigaction                    sys_rt_sigaction                compat_sys_rt_sigaction
 195     o32     rt_sigprocmask                  sys_rt_sigprocmask              compat_sys_rt_sigprocmask
 196     o32     rt_sigpending                   sys_rt_sigpending               compat_sys_rt_sigpending
-197     o32     rt_sigtimedwait                 sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait
+197     o32     rt_sigtimedwait                 sys_rt_sigtimedwait_time32      compat_sys_rt_sigtimedwait_time32
 198     o32     rt_sigqueueinfo                 sys_rt_sigqueueinfo             compat_sys_rt_sigqueueinfo
 199     o32     rt_sigsuspend                   sys_rt_sigsuspend               compat_sys_rt_sigsuspend
 200     o32     pread64                         sys_pread64                     sys_32_pread
@@ -249,12 +249,12 @@
 235     o32     fremovexattr                    sys_fremovexattr
 236     o32     tkill                           sys_tkill
 237     o32     sendfile64                      sys_sendfile64
-238     o32     futex                           sys_futex                       compat_sys_futex
+238     o32     futex                           sys_futex_time32
 239     o32     sched_setaffinity               sys_sched_setaffinity           compat_sys_sched_setaffinity
 240     o32     sched_getaffinity               sys_sched_getaffinity           compat_sys_sched_getaffinity
 241     o32     io_setup                        sys_io_setup                    compat_sys_io_setup
 242     o32     io_destroy                      sys_io_destroy
-243     o32     io_getevents                    sys_io_getevents                compat_sys_io_getevents
+243     o32     io_getevents                    sys_io_getevents_time32
 244     o32     io_submit                       sys_io_submit                   compat_sys_io_submit
 245     o32     io_cancel                       sys_io_cancel
 246     o32     exit_group                      sys_exit_group
@@ -269,23 +269,23 @@
 255     o32     statfs64                        sys_statfs64                    compat_sys_statfs64
 256     o32     fstatfs64                       sys_fstatfs64                   compat_sys_fstatfs64
 257     o32     timer_create                    sys_timer_create                compat_sys_timer_create
-258     o32     timer_settime                   sys_timer_settime               compat_sys_timer_settime
-259     o32     timer_gettime                   sys_timer_gettime               compat_sys_timer_gettime
+258     o32     timer_settime                   sys_timer_settime32
+259     o32     timer_gettime                   sys_timer_gettime32
 260     o32     timer_getoverrun                sys_timer_getoverrun
 261     o32     timer_delete                    sys_timer_delete
-262     o32     clock_settime                   sys_clock_settime               compat_sys_clock_settime
-263     o32     clock_gettime                   sys_clock_gettime               compat_sys_clock_gettime
-264     o32     clock_getres                    sys_clock_getres                compat_sys_clock_getres
-265     o32     clock_nanosleep                 sys_clock_nanosleep             compat_sys_clock_nanosleep
+262     o32     clock_settime                   sys_clock_settime32
+263     o32     clock_gettime                   sys_clock_gettime32
+264     o32     clock_getres                    sys_clock_getres_time32
+265     o32     clock_nanosleep                 sys_clock_nanosleep_time32
 266     o32     tgkill                          sys_tgkill
-267     o32     utimes                          sys_utimes                      compat_sys_utimes
+267     o32     utimes                          sys_utimes_time32
 268     o32     mbind                           sys_mbind                       compat_sys_mbind
 269     o32     get_mempolicy                   sys_get_mempolicy               compat_sys_get_mempolicy
 270     o32     set_mempolicy                   sys_set_mempolicy               compat_sys_set_mempolicy
 271     o32     mq_open                         sys_mq_open                     compat_sys_mq_open
 272     o32     mq_unlink                       sys_mq_unlink
-273     o32     mq_timedsend                    sys_mq_timedsend                compat_sys_mq_timedsend
-274     o32     mq_timedreceive                 sys_mq_timedreceive             compat_sys_mq_timedreceive
+273     o32     mq_timedsend                    sys_mq_timedsend_time32
+274     o32     mq_timedreceive                 sys_mq_timedreceive_time32
 275     o32     mq_notify                       sys_mq_notify                   compat_sys_mq_notify
 276     o32     mq_getsetattr                   sys_mq_getsetattr               compat_sys_mq_getsetattr
 277     o32     vserver                         sys_ni_syscall
@@ -303,7 +303,7 @@
 289     o32     mkdirat                         sys_mkdirat
 290     o32     mknodat                         sys_mknodat
 291     o32     fchownat                        sys_fchownat
-292     o32     futimesat                       sys_futimesat                   compat_sys_futimesat
+292     o32     futimesat                       sys_futimesat_time32
 293     o32     fstatat64                       sys_fstatat64                   sys_newfstatat
 294     o32     unlinkat                        sys_unlinkat
 295     o32     renameat                        sys_renameat
@@ -312,8 +312,8 @@
 298     o32     readlinkat                      sys_readlinkat
 299     o32     fchmodat                        sys_fchmodat
 300     o32     faccessat                       sys_faccessat
-301     o32     pselect6                        sys_pselect6                    compat_sys_pselect6
-302     o32     ppoll                           sys_ppoll                       compat_sys_ppoll
+301     o32     pselect6                        sys_pselect6_time32             compat_sys_pselect6_time32
+302     o32     ppoll                           sys_ppoll_time32                compat_sys_ppoll_time32
 303     o32     unshare                         sys_unshare
 304     o32     splice                          sys_splice
 305     o32     sync_file_range                 sys_sync_file_range             sys32_sync_file_range
@@ -327,14 +327,14 @@
 313     o32     epoll_pwait                     sys_epoll_pwait                 compat_sys_epoll_pwait
 314     o32     ioprio_set                      sys_ioprio_set
 315     o32     ioprio_get                      sys_ioprio_get
-316     o32     utimensat                       sys_utimensat                   compat_sys_utimensat
+316     o32     utimensat                       sys_utimensat_time32
 317     o32     signalfd                        sys_signalfd                    compat_sys_signalfd
 318     o32     timerfd                         sys_ni_syscall
 319     o32     eventfd                         sys_eventfd
 320     o32     fallocate                       sys_fallocate                   sys32_fallocate
 321     o32     timerfd_create                  sys_timerfd_create
-322     o32     timerfd_gettime                 sys_timerfd_gettime             compat_sys_timerfd_gettime
-323     o32     timerfd_settime                 sys_timerfd_settime             compat_sys_timerfd_settime
+322     o32     timerfd_gettime                 sys_timerfd_gettime32
+323     o32     timerfd_settime                 sys_timerfd_settime32
 324     o32     signalfd4                       sys_signalfd4                   compat_sys_signalfd4
 325     o32     eventfd2                        sys_eventfd2
 326     o32     epoll_create1                   sys_epoll_create1
@@ -346,13 +346,13 @@
 332     o32     rt_tgsigqueueinfo               sys_rt_tgsigqueueinfo           compat_sys_rt_tgsigqueueinfo
 333     o32     perf_event_open                 sys_perf_event_open
 334     o32     accept4                         sys_accept4
-335     o32     recvmmsg                        sys_recvmmsg                    compat_sys_recvmmsg
+335     o32     recvmmsg                        sys_recvmmsg_time32             compat_sys_recvmmsg_time32
 336     o32     fanotify_init                   sys_fanotify_init
 337     o32     fanotify_mark                   sys_fanotify_mark               compat_sys_fanotify_mark
 338     o32     prlimit64                       sys_prlimit64
 339     o32     name_to_handle_at               sys_name_to_handle_at
 340     o32     open_by_handle_at               sys_open_by_handle_at           compat_sys_open_by_handle_at
-341     o32     clock_adjtime                   sys_clock_adjtime               compat_sys_clock_adjtime
+341     o32     clock_adjtime                   sys_clock_adjtime32
 342     o32     syncfs                          sys_syncfs
 343     o32     sendmmsg                        sys_sendmmsg                    compat_sys_sendmmsg
 344     o32     setns                           sys_setns
@@ -379,7 +379,7 @@
 365     o32     pkey_free                       sys_pkey_free
 366     o32     statx                           sys_statx
 367     o32     rseq                            sys_rseq
-368     o32     io_pgetevents                   sys_io_pgetevents               compat_sys_io_pgetevents
+368     o32     io_pgetevents                   sys_io_pgetevents_time32        compat_sys_io_pgetevents
 # room for arch specific calls
 393     o32     semget                          sys_semget
 394     o32     semctl                          sys_semctl                      compat_sys_semctl
@@ -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/include/asm/unistd.h b/arch/parisc/include/asm/unistd.h
index ac742b80e333..b0838dc4dfee 100644
--- a/arch/parisc/include/asm/unistd.h
+++ b/arch/parisc/include/asm/unistd.h
@@ -152,10 +152,8 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
 #define __ARCH_WANT_SYS_GETHOSTNAME
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_COMPAT_SYS_TIME
+#define __ARCH_WANT_SYS_TIME32
 #define __ARCH_WANT_COMPAT_SYS_SCHED_RR_GET_INTERVAL
-#define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
@@ -170,6 +168,11 @@ type name(type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)	\
 #define __ARCH_WANT_SYS_CLONE
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 
+#ifdef CONFIG_64BIT
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_UTIME
+#endif
+
 #endif /* __ASSEMBLY__ */
 
 #undef STR
diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl
index 71873bb72782..b26766c6647d 100644
--- a/arch/parisc/kernel/syscalls/syscall.tbl
+++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -20,7 +20,8 @@
 10      common  unlink                  sys_unlink
 11      common  execve                  sys_execve                      compat_sys_execve
 12      common  chdir                   sys_chdir
-13      common  time                    sys_time                        compat_sys_time
+13      32      time                    sys_time32
+13      64      time                    sys_time
 14      common  mknod                   sys_mknod
 15      common  chmod                   sys_chmod
 16      common  lchown                  sys_lchown
@@ -32,12 +33,14 @@
 22      common  bind                    sys_bind
 23      common  setuid                  sys_setuid
 24      common  getuid                  sys_getuid
-25      common  stime                   sys_stime                       compat_sys_stime
+25      32      stime                   sys_stime32
+25      64      stime                   sys_stime
 26      common  ptrace                  sys_ptrace                      compat_sys_ptrace
 27      common  alarm                   sys_alarm
 28      common  fstat                   sys_newfstat                    compat_sys_newfstat
 29      common  pause                   sys_pause
-30      common  utime                   sys_utime                       compat_sys_utime
+30      32      utime                   sys_utime32
+30      64      utime                   sys_utime
 31      common  connect                 sys_connect
 32      common  listen                  sys_listen
 33      common  access                  sys_access
@@ -133,7 +136,8 @@
 121     common  setdomainname           sys_setdomainname
 122     common  sendfile                sys_sendfile                    compat_sys_sendfile
 123     common  recvfrom                sys_recvfrom
-124     common  adjtimex                sys_adjtimex                    compat_sys_adjtimex
+124     32      adjtimex                sys_adjtimex_time32
+124     64      adjtimex                sys_adjtimex
 125     common  mprotect                sys_mprotect
 126     common  sigprocmask             sys_sigprocmask                 compat_sys_sigprocmask
 # 127 was create_module
@@ -171,8 +175,10 @@
 158     common  sched_yield             sys_sched_yield
 159     common  sched_get_priority_max  sys_sched_get_priority_max
 160     common  sched_get_priority_min  sys_sched_get_priority_min
-161     common  sched_rr_get_interval   sys_sched_rr_get_interval       compat_sys_sched_rr_get_interval
-162     common  nanosleep               sys_nanosleep                   compat_sys_nanosleep
+161     32      sched_rr_get_interval   sys_sched_rr_get_interval_time32
+161     64      sched_rr_get_interval   sys_sched_rr_get_interval
+162     32      nanosleep               sys_nanosleep_time32
+162     64      nanosleep               sys_nanosleep
 163     common  mremap                  sys_mremap
 164     common  setresuid               sys_setresuid
 165     common  getresuid               sys_getresuid
@@ -187,7 +193,8 @@
 174     common  rt_sigaction            sys_rt_sigaction                compat_sys_rt_sigaction
 175     common  rt_sigprocmask          sys_rt_sigprocmask              compat_sys_rt_sigprocmask
 176     common  rt_sigpending           sys_rt_sigpending               compat_sys_rt_sigpending
-177     common  rt_sigtimedwait         sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait
+177     32      rt_sigtimedwait         sys_rt_sigtimedwait_time32      compat_sys_rt_sigtimedwait_time32
+177     64      rt_sigtimedwait         sys_rt_sigtimedwait
 178     common  rt_sigqueueinfo         sys_rt_sigqueueinfo             compat_sys_rt_sigqueueinfo
 179     common  rt_sigsuspend           sys_rt_sigsuspend               compat_sys_rt_sigsuspend
 180     common  chown                   sys_chown
@@ -223,14 +230,16 @@
 207     64      readahead               sys_readahead
 208     common  tkill                   sys_tkill
 209     common  sendfile64              sys_sendfile64                  compat_sys_sendfile64
-210     common  futex                   sys_futex                       compat_sys_futex
+210     32      futex                   sys_futex_time32
+210     64      futex                   sys_futex
 211     common  sched_setaffinity       sys_sched_setaffinity           compat_sys_sched_setaffinity
 212     common  sched_getaffinity       sys_sched_getaffinity           compat_sys_sched_getaffinity
 # 213 was set_thread_area
 # 214 was get_thread_area
 215     common  io_setup                sys_io_setup                    compat_sys_io_setup
 216     common  io_destroy              sys_io_destroy
-217     common  io_getevents            sys_io_getevents                compat_sys_io_getevents
+217     32      io_getevents            sys_io_getevents_time32
+217     64      io_getevents            sys_io_getevents
 218     common  io_submit               sys_io_submit                   compat_sys_io_submit
 219     common  io_cancel               sys_io_cancel
 # 220 was alloc_hugepages
@@ -241,11 +250,14 @@
 225     common  epoll_ctl               sys_epoll_ctl
 226     common  epoll_wait              sys_epoll_wait
 227     common  remap_file_pages        sys_remap_file_pages
-228     common  semtimedop              sys_semtimedop                  compat_sys_semtimedop
+228     32      semtimedop              sys_semtimedop_time32
+228     64      semtimedop              sys_semtimedop
 229     common  mq_open                 sys_mq_open                     compat_sys_mq_open
 230     common  mq_unlink               sys_mq_unlink
-231     common  mq_timedsend            sys_mq_timedsend                compat_sys_mq_timedsend
-232     common  mq_timedreceive         sys_mq_timedreceive             compat_sys_mq_timedreceive
+231     32      mq_timedsend            sys_mq_timedsend_time32
+231     64      mq_timedsend            sys_mq_timedsend
+232     32      mq_timedreceive         sys_mq_timedreceive_time32
+232     64      mq_timedreceive         sys_mq_timedreceive
 233     common  mq_notify               sys_mq_notify                   compat_sys_mq_notify
 234     common  mq_getsetattr           sys_mq_getsetattr               compat_sys_mq_getsetattr
 235     common  waitid                  sys_waitid                      compat_sys_waitid
@@ -265,14 +277,20 @@
 248     common  lremovexattr            sys_lremovexattr
 249     common  fremovexattr            sys_fremovexattr
 250     common  timer_create            sys_timer_create                compat_sys_timer_create
-251     common  timer_settime           sys_timer_settime               compat_sys_timer_settime
-252     common  timer_gettime           sys_timer_gettime               compat_sys_timer_gettime
+251     32      timer_settime           sys_timer_settime32
+251     64      timer_settime           sys_timer_settime
+252     32      timer_gettime           sys_timer_gettime32
+252     64      timer_gettime           sys_timer_gettime
 253     common  timer_getoverrun        sys_timer_getoverrun
 254     common  timer_delete            sys_timer_delete
-255     common  clock_settime           sys_clock_settime               compat_sys_clock_settime
-256     common  clock_gettime           sys_clock_gettime               compat_sys_clock_gettime
-257     common  clock_getres            sys_clock_getres                compat_sys_clock_getres
-258     common  clock_nanosleep         sys_clock_nanosleep             compat_sys_clock_nanosleep
+255     32      clock_settime           sys_clock_settime32
+255     64      clock_settime           sys_clock_settime
+256     32      clock_gettime           sys_clock_gettime32
+256     64      clock_gettime           sys_clock_gettime
+257     32      clock_getres            sys_clock_getres_time32
+257     64      clock_getres            sys_clock_getres
+258     32      clock_nanosleep         sys_clock_nanosleep_time32
+258     64      clock_nanosleep         sys_clock_nanosleep
 259     common  tgkill                  sys_tgkill
 260     common  mbind                   sys_mbind                       compat_sys_mbind
 261     common  get_mempolicy           sys_get_mempolicy               compat_sys_get_mempolicy
@@ -287,13 +305,16 @@
 270     common  inotify_add_watch       sys_inotify_add_watch
 271     common  inotify_rm_watch        sys_inotify_rm_watch
 272     common  migrate_pages           sys_migrate_pages
-273     common  pselect6                sys_pselect6                    compat_sys_pselect6
-274     common  ppoll                   sys_ppoll                       compat_sys_ppoll
+273     32      pselect6                sys_pselect6_time32             compat_sys_pselect6_time32
+273     64      pselect6                sys_pselect6
+274     32      ppoll                   sys_ppoll_time32                compat_sys_ppoll_time32
+274     64      ppoll                   sys_ppoll
 275     common  openat                  sys_openat                      compat_sys_openat
 276     common  mkdirat                 sys_mkdirat
 277     common  mknodat                 sys_mknodat
 278     common  fchownat                sys_fchownat
-279     common  futimesat               sys_futimesat                   compat_sys_futimesat
+279     32      futimesat               sys_futimesat_time32
+279     64      futimesat               sys_futimesat
 280     common  fstatat64               sys_fstatat64
 281     common  unlinkat                sys_unlinkat
 282     common  renameat                sys_renameat
@@ -316,15 +337,18 @@
 298     common  statfs64                sys_statfs64                    compat_sys_statfs64
 299     common  fstatfs64               sys_fstatfs64                   compat_sys_fstatfs64
 300     common  kexec_load              sys_kexec_load                  compat_sys_kexec_load
-301     common  utimensat               sys_utimensat                   compat_sys_utimensat
+301     32      utimensat               sys_utimensat_time32
+301     64      utimensat               sys_utimensat
 302     common  signalfd                sys_signalfd                    compat_sys_signalfd
 # 303 was timerfd
 304     common  eventfd                 sys_eventfd
 305     32      fallocate               parisc_fallocate
 305     64      fallocate               sys_fallocate
 306     common  timerfd_create          sys_timerfd_create
-307     common  timerfd_settime         sys_timerfd_settime             compat_sys_timerfd_settime
-308     common  timerfd_gettime         sys_timerfd_gettime             compat_sys_timerfd_gettime
+307     32      timerfd_settime         sys_timerfd_settime32
+307     64      timerfd_settime         sys_timerfd_settime
+308     32      timerfd_gettime         sys_timerfd_gettime32
+308     64      timerfd_gettime         sys_timerfd_gettime
 309     common  signalfd4               sys_signalfd4                   compat_sys_signalfd4
 310     common  eventfd2                sys_eventfd2
 311     common  epoll_create1           sys_epoll_create1
@@ -335,12 +359,14 @@
 316     common  pwritev sys_pwritev     compat_sys_pwritev
 317     common  rt_tgsigqueueinfo       sys_rt_tgsigqueueinfo           compat_sys_rt_tgsigqueueinfo
 318     common  perf_event_open         sys_perf_event_open
-319     common  recvmmsg                sys_recvmmsg                    compat_sys_recvmmsg
+319     32      recvmmsg                sys_recvmmsg_time32             compat_sys_recvmmsg_time32
+319     64      recvmmsg                sys_recvmmsg
 320     common  accept4                 sys_accept4
 321     common  prlimit64               sys_prlimit64
 322     common  fanotify_init           sys_fanotify_init
 323     common  fanotify_mark           sys_fanotify_mark               sys32_fanotify_mark
-324     common  clock_adjtime           sys_clock_adjtime               compat_sys_clock_adjtime
+324     32      clock_adjtime           sys_clock_adjtime32
+324     64      clock_adjtime           sys_clock_adjtime
 325     common  name_to_handle_at       sys_name_to_handle_at
 326     common  open_by_handle_at       sys_open_by_handle_at           compat_sys_open_by_handle_at
 327     common  syncfs                  sys_syncfs
@@ -352,7 +378,8 @@
 333     common  finit_module            sys_finit_module
 334     common  sched_setattr           sys_sched_setattr
 335     common  sched_getattr           sys_sched_getattr
-336     common  utimes                  sys_utimes                      compat_sys_utimes
+336     32      utimes                  sys_utimes_time32
+336     64      utimes                  sys_utimes
 337     common  renameat2               sys_renameat2
 338     common  seccomp                 sys_seccomp
 339     common  getrandom               sys_getrandom
@@ -366,8 +393,30 @@
 347     common  preadv2                 sys_preadv2                     compat_sys_preadv2
 348     common  pwritev2                sys_pwritev2                    compat_sys_pwritev2
 349     common  statx                   sys_statx
-350     common  io_pgetevents           sys_io_pgetevents               compat_sys_io_pgetevents
+350     32      io_pgetevents           sys_io_pgetevents_time32        compat_sys_io_pgetevents
+350     64      io_pgetevents           sys_io_pgetevents
 351     common  pkey_mprotect           sys_pkey_mprotect
 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/include/asm/unistd.h b/arch/powerpc/include/asm/unistd.h
index a3c35e6d6ffb..f44dbc65e38e 100644
--- a/arch/powerpc/include/asm/unistd.h
+++ b/arch/powerpc/include/asm/unistd.h
@@ -29,8 +29,8 @@
 #define __ARCH_WANT_SYS_IPC
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_TIME32
+#define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
 #define __ARCH_WANT_SYS_FADVISE64
@@ -45,8 +45,8 @@
 #define __ARCH_WANT_OLD_STAT
 #endif
 #ifdef CONFIG_PPC64
-#define __ARCH_WANT_COMPAT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME32
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_SYS_NEWFSTATAT
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl
index 7555874ce39c..b18abb0c3dae 100644
--- a/arch/powerpc/kernel/syscalls/syscall.tbl
+++ b/arch/powerpc/kernel/syscalls/syscall.tbl
@@ -20,7 +20,9 @@
 10      common  unlink                          sys_unlink
 11      nospu   execve                          sys_execve                      compat_sys_execve
 12      common  chdir                           sys_chdir
-13      common  time                            sys_time                        compat_sys_time
+13      32      time                            sys_time32
+13      64      time                            sys_time
+13      spu     time                            sys_time
 14      common  mknod                           sys_mknod
 15      common  chmod                           sys_chmod
 16      common  lchown                          sys_lchown
@@ -36,14 +38,17 @@
 22      spu     umount                          sys_ni_syscall
 23      common  setuid                          sys_setuid
 24      common  getuid                          sys_getuid
-25      common  stime                           sys_stime                       compat_sys_stime
+25      32      stime                           sys_stime32
+25      64      stime                           sys_stime
+25      spu     stime                           sys_stime
 26      nospu   ptrace                          sys_ptrace                      compat_sys_ptrace
 27      common  alarm                           sys_alarm
 28      32      oldfstat                        sys_fstat                       sys_ni_syscall
 28      64      oldfstat                        sys_ni_syscall
 28      spu     oldfstat                        sys_ni_syscall
 29      nospu   pause                           sys_pause
-30      nospu   utime                           sys_utime                       compat_sys_utime
+30      32      utime                           sys_utime32
+30      64      utime                           sys_utime
 31      common  stty                            sys_ni_syscall
 32      common  gtty                            sys_ni_syscall
 33      common  access                          sys_access
@@ -157,7 +162,9 @@
 121     common  setdomainname                   sys_setdomainname
 122     common  uname                           sys_newuname
 123     common  modify_ldt                      sys_ni_syscall
-124     common  adjtimex                        sys_adjtimex                    compat_sys_adjtimex
+124     32      adjtimex                        sys_adjtimex_time32
+124     64      adjtimex                        sys_adjtimex
+124     spu     adjtimex                        sys_adjtimex
 125     common  mprotect                        sys_mprotect
 126     32      sigprocmask                     sys_sigprocmask                 compat_sys_sigprocmask
 126     64      sigprocmask                     sys_ni_syscall
@@ -198,8 +205,12 @@
 158     common  sched_yield                     sys_sched_yield
 159     common  sched_get_priority_max          sys_sched_get_priority_max
 160     common  sched_get_priority_min          sys_sched_get_priority_min
-161     common  sched_rr_get_interval           sys_sched_rr_get_interval       compat_sys_sched_rr_get_interval
-162     common  nanosleep                       sys_nanosleep                   compat_sys_nanosleep
+161     32      sched_rr_get_interval           sys_sched_rr_get_interval_time32
+161     64      sched_rr_get_interval           sys_sched_rr_get_interval
+161     spu     sched_rr_get_interval           sys_sched_rr_get_interval
+162     32      nanosleep                       sys_nanosleep_time32
+162     64      nanosleep                       sys_nanosleep
+162     spu     nanosleep                       sys_nanosleep
 163     common  mremap                          sys_mremap
 164     common  setresuid                       sys_setresuid
 165     common  getresuid                       sys_getresuid
@@ -213,7 +224,8 @@
 173     nospu   rt_sigaction                    sys_rt_sigaction                compat_sys_rt_sigaction
 174     nospu   rt_sigprocmask                  sys_rt_sigprocmask              compat_sys_rt_sigprocmask
 175     nospu   rt_sigpending                   sys_rt_sigpending               compat_sys_rt_sigpending
-176     nospu   rt_sigtimedwait                 sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait
+176     32      rt_sigtimedwait                 sys_rt_sigtimedwait_time32      compat_sys_rt_sigtimedwait_time32
+176     64      rt_sigtimedwait                 sys_rt_sigtimedwait
 177     nospu   rt_sigqueueinfo                 sys_rt_sigqueueinfo             compat_sys_rt_sigqueueinfo
 178     nospu   rt_sigsuspend                   sys_rt_sigsuspend               compat_sys_rt_sigsuspend
 179     common  pread64                         sys_pread64                     compat_sys_pread64
@@ -260,7 +272,9 @@
 218     common  removexattr                     sys_removexattr
 219     common  lremovexattr                    sys_lremovexattr
 220     common  fremovexattr                    sys_fremovexattr
-221     common  futex                           sys_futex                       compat_sys_futex
+221     32      futex                           sys_futex_time32
+221     64      futex                           sys_futex
+221     spu     futex                           sys_futex
 222     common  sched_setaffinity               sys_sched_setaffinity           compat_sys_sched_setaffinity
 223     common  sched_getaffinity               sys_sched_getaffinity           compat_sys_sched_getaffinity
 # 224 unused
@@ -268,7 +282,9 @@
 226     32      sendfile64                      sys_sendfile64                  compat_sys_sendfile64
 227     common  io_setup                        sys_io_setup                    compat_sys_io_setup
 228     common  io_destroy                      sys_io_destroy
-229     common  io_getevents                    sys_io_getevents                compat_sys_io_getevents
+229     32      io_getevents                    sys_io_getevents_time32
+229     64      io_getevents                    sys_io_getevents
+229     spu     io_getevents                    sys_io_getevents
 230     common  io_submit                       sys_io_submit                   compat_sys_io_submit
 231     common  io_cancel                       sys_io_cancel
 232     nospu   set_tid_address                 sys_set_tid_address
@@ -280,19 +296,33 @@
 238     common  epoll_wait                      sys_epoll_wait
 239     common  remap_file_pages                sys_remap_file_pages
 240     common  timer_create                    sys_timer_create                compat_sys_timer_create
-241     common  timer_settime                   sys_timer_settime               compat_sys_timer_settime
-242     common  timer_gettime                   sys_timer_gettime               compat_sys_timer_gettime
+241     32      timer_settime                   sys_timer_settime32
+241     64      timer_settime                   sys_timer_settime
+241     spu     timer_settime                   sys_timer_settime
+242     32      timer_gettime                   sys_timer_gettime32
+242     64      timer_gettime                   sys_timer_gettime
+242     spu     timer_gettime                   sys_timer_gettime
 243     common  timer_getoverrun                sys_timer_getoverrun
 244     common  timer_delete                    sys_timer_delete
-245     common  clock_settime                   sys_clock_settime               compat_sys_clock_settime
-246     common  clock_gettime                   sys_clock_gettime               compat_sys_clock_gettime
-247     common  clock_getres                    sys_clock_getres                compat_sys_clock_getres
-248     common  clock_nanosleep                 sys_clock_nanosleep             compat_sys_clock_nanosleep
+245     32      clock_settime                   sys_clock_settime32
+245     64      clock_settime                   sys_clock_settime
+245     spu     clock_settime                   sys_clock_settime
+246     32      clock_gettime                   sys_clock_gettime32
+246     64      clock_gettime                   sys_clock_gettime
+246     spu     clock_gettime                   sys_clock_gettime
+247     32      clock_getres                    sys_clock_getres_time32
+247     64      clock_getres                    sys_clock_getres
+247     spu     clock_getres                    sys_clock_getres
+248     32      clock_nanosleep                 sys_clock_nanosleep_time32
+248     64      clock_nanosleep                 sys_clock_nanosleep
+248     spu     clock_nanosleep                 sys_clock_nanosleep
 249     32      swapcontext                     ppc_swapcontext                 ppc32_swapcontext
 249     64      swapcontext                     ppc64_swapcontext
 249     spu     swapcontext                     sys_ni_syscall
 250     common  tgkill                          sys_tgkill
-251     common  utimes                          sys_utimes                      compat_sys_utimes
+251     32      utimes                          sys_utimes_time32
+251     64      utimes                          sys_utimes
+251     spu     utimes                          sys_utimes
 252     common  statfs64                        sys_statfs64                    compat_sys_statfs64
 253     common  fstatfs64                       sys_fstatfs64                   compat_sys_fstatfs64
 254     32      fadvise64_64                    ppc_fadvise64_64
@@ -308,8 +338,10 @@
 261     nospu   set_mempolicy                   sys_set_mempolicy               compat_sys_set_mempolicy
 262     nospu   mq_open                         sys_mq_open                     compat_sys_mq_open
 263     nospu   mq_unlink                       sys_mq_unlink
-264     nospu   mq_timedsend                    sys_mq_timedsend                compat_sys_mq_timedsend
-265     nospu   mq_timedreceive                 sys_mq_timedreceive             compat_sys_mq_timedreceive
+264     32      mq_timedsend                    sys_mq_timedsend_time32
+264     64      mq_timedsend                    sys_mq_timedsend
+265     32      mq_timedreceive                 sys_mq_timedreceive_time32
+265     64      mq_timedreceive                 sys_mq_timedreceive
 266     nospu   mq_notify                       sys_mq_notify                   compat_sys_mq_notify
 267     nospu   mq_getsetattr                   sys_mq_getsetattr               compat_sys_mq_getsetattr
 268     nospu   kexec_load                      sys_kexec_load                  compat_sys_kexec_load
@@ -324,8 +356,10 @@
 277     nospu   inotify_rm_watch                sys_inotify_rm_watch
 278     nospu   spu_run                         sys_spu_run
 279     nospu   spu_create                      sys_spu_create
-280     nospu   pselect6                        sys_pselect6                    compat_sys_pselect6
-281     nospu   ppoll                           sys_ppoll                       compat_sys_ppoll
+280     32      pselect6                        sys_pselect6_time32             compat_sys_pselect6_time32
+280     64      pselect6                        sys_pselect6
+281     32      ppoll                           sys_ppoll_time32                compat_sys_ppoll_time32
+281     64      ppoll                           sys_ppoll
 282     common  unshare                         sys_unshare
 283     common  splice                          sys_splice
 284     common  tee                             sys_tee
@@ -334,7 +368,9 @@
 287     common  mkdirat                         sys_mkdirat
 288     common  mknodat                         sys_mknodat
 289     common  fchownat                        sys_fchownat
-290     common  futimesat                       sys_futimesat                   compat_sys_futimesat
+290     32      futimesat                       sys_futimesat_time32
+290     64      futimesat                       sys_futimesat
+290     spu     utimesat                        sys_futimesat
 291     32      fstatat64                       sys_fstatat64
 291     64      newfstatat                      sys_newfstatat
 291     spu     newfstatat                      sys_newfstatat
@@ -350,15 +386,21 @@
 301     common  move_pages                      sys_move_pages                  compat_sys_move_pages
 302     common  getcpu                          sys_getcpu
 303     nospu   epoll_pwait                     sys_epoll_pwait                 compat_sys_epoll_pwait
-304     common  utimensat                       sys_utimensat                   compat_sys_utimensat
+304     32      utimensat                       sys_utimensat_time32
+304     64      utimensat                       sys_utimensat
+304     spu     utimensat                       sys_utimensat
 305     common  signalfd                        sys_signalfd                    compat_sys_signalfd
 306     common  timerfd_create                  sys_timerfd_create
 307     common  eventfd                         sys_eventfd
 308     common  sync_file_range2                sys_sync_file_range2            compat_sys_sync_file_range2
 309     nospu   fallocate                       sys_fallocate                   compat_sys_fallocate
 310     nospu   subpage_prot                    sys_subpage_prot
-311     common  timerfd_settime                 sys_timerfd_settime             compat_sys_timerfd_settime
-312     common  timerfd_gettime                 sys_timerfd_gettime             compat_sys_timerfd_gettime
+311     32      timerfd_settime                 sys_timerfd_settime32
+311     64      timerfd_settime                 sys_timerfd_settime
+311     spu     timerfd_settime                 sys_timerfd_settime
+312     32      timerfd_gettime                 sys_timerfd_gettime32
+312     64      timerfd_gettime                 sys_timerfd_gettime
+312     spu     timerfd_gettime                 sys_timerfd_gettime
 313     common  signalfd4                       sys_signalfd4                   compat_sys_signalfd4
 314     common  eventfd2                        sys_eventfd2
 315     common  epoll_create1                   sys_epoll_create1
@@ -389,11 +431,15 @@
 340     common  getsockopt                      sys_getsockopt                  compat_sys_getsockopt
 341     common  sendmsg                         sys_sendmsg                     compat_sys_sendmsg
 342     common  recvmsg                         sys_recvmsg                     compat_sys_recvmsg
-343     common  recvmmsg                        sys_recvmmsg                    compat_sys_recvmmsg
+343     32      recvmmsg                        sys_recvmmsg_time32             compat_sys_recvmmsg_time32
+343     64      recvmmsg                        sys_recvmmsg
+343     spu     recvmmsg                        sys_recvmmsg
 344     common  accept4                         sys_accept4
 345     common  name_to_handle_at               sys_name_to_handle_at
 346     common  open_by_handle_at               sys_open_by_handle_at           compat_sys_open_by_handle_at
-347     common  clock_adjtime                   sys_clock_adjtime               compat_sys_clock_adjtime
+347     32      clock_adjtime                   sys_clock_adjtime32
+347     64      clock_adjtime                   sys_clock_adjtime
+347     spu     clock_adjtime                   sys_clock_adjtime
 348     common  syncfs                          sys_syncfs
 349     common  sendmmsg                        sys_sendmmsg                    compat_sys_sendmmsg
 350     common  setns                           sys_setns
@@ -425,7 +471,8 @@
 385     nospu   pkey_free                       sys_pkey_free
 386     nospu   pkey_mprotect                   sys_pkey_mprotect
 387     nospu   rseq                            sys_rseq
-388     nospu   io_pgetevents                   sys_io_pgetevents               compat_sys_io_pgetevents
+388     32      io_pgetevents                   sys_io_pgetevents_time32        compat_sys_io_pgetevents
+388     64      io_pgetevents                   sys_io_pgetevents
 # room for arch specific syscalls
 392     64      semtimedop                      sys_semtimedop
 393     common  semget                          sys_semget
@@ -438,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/include/asm/unistd.h b/arch/s390/include/asm/unistd.h
index 59202ceea1f6..b6755685c7b8 100644
--- a/arch/s390/include/asm/unistd.h
+++ b/arch/s390/include/asm/unistd.h
@@ -28,7 +28,7 @@
 #define __ARCH_WANT_SYS_SIGPENDING
 #define __ARCH_WANT_SYS_SIGPROCMASK
 # ifdef CONFIG_COMPAT
-#   define __ARCH_WANT_COMPAT_SYS_TIME
+#   define __ARCH_WANT_SYS_TIME32
 #   define __ARCH_WANT_SYS_UTIME32
 # endif
 #define __ARCH_WANT_SYS_FORK
diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl
index 620e222003ca..02579f95f391 100644
--- a/arch/s390/kernel/syscalls/syscall.tbl
+++ b/arch/s390/kernel/syscalls/syscall.tbl
@@ -20,7 +20,7 @@
 10   common     unlink                  sys_unlink                      sys_unlink
 11   common     execve                  sys_execve                      compat_sys_execve
 12   common     chdir                   sys_chdir                       sys_chdir
-13   32         time                    -                               compat_sys_time
+13   32         time                    -                               sys_time32
 14   common     mknod                   sys_mknod                       sys_mknod
 15   common     chmod                   sys_chmod                       sys_chmod
 16   32         lchown                  -                               sys_lchown16
@@ -30,11 +30,11 @@
 22   common     umount                  sys_oldumount                   sys_oldumount
 23   32         setuid                  -                               sys_setuid16
 24   32         getuid                  -                               sys_getuid16
-25   32         stime                   -                               compat_sys_stime
+25   32         stime                   -                               sys_stime32
 26   common     ptrace                  sys_ptrace                      compat_sys_ptrace
 27   common     alarm                   sys_alarm                       sys_alarm
 29   common     pause                   sys_pause                       sys_pause
-30   common     utime                   sys_utime                       compat_sys_utime
+30   common     utime                   sys_utime                       sys_utime32
 33   common     access                  sys_access                      sys_access
 34   common     nice                    sys_nice                        sys_nice
 36   common     sync                    sys_sync                        sys_sync
@@ -112,7 +112,7 @@
 120  common     clone                   sys_clone                       sys_clone
 121  common     setdomainname           sys_setdomainname               sys_setdomainname
 122  common     uname                   sys_newuname                    sys_newuname
-124  common     adjtimex                sys_adjtimex                    compat_sys_adjtimex
+124  common     adjtimex                sys_adjtimex                    sys_adjtimex_time32
 125  common     mprotect                sys_mprotect                    sys_mprotect
 126  common     sigprocmask             sys_sigprocmask                 compat_sys_sigprocmask
 127  common     create_module           -                               -
@@ -150,8 +150,8 @@
 158  common     sched_yield             sys_sched_yield                 sys_sched_yield
 159  common     sched_get_priority_max  sys_sched_get_priority_max      sys_sched_get_priority_max
 160  common     sched_get_priority_min  sys_sched_get_priority_min      sys_sched_get_priority_min
-161  common     sched_rr_get_interval   sys_sched_rr_get_interval       compat_sys_sched_rr_get_interval
-162  common     nanosleep               sys_nanosleep                   compat_sys_nanosleep
+161  common     sched_rr_get_interval   sys_sched_rr_get_interval       sys_sched_rr_get_interval_time32
+162  common     nanosleep               sys_nanosleep                   sys_nanosleep_time32
 163  common     mremap                  sys_mremap                      sys_mremap
 164  32         setresuid               -                               sys_setresuid16
 165  32         getresuid               -                               sys_getresuid16
@@ -165,7 +165,7 @@
 174  common     rt_sigaction            sys_rt_sigaction                compat_sys_rt_sigaction
 175  common     rt_sigprocmask          sys_rt_sigprocmask              compat_sys_rt_sigprocmask
 176  common     rt_sigpending           sys_rt_sigpending               compat_sys_rt_sigpending
-177  common     rt_sigtimedwait         sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait
+177  common     rt_sigtimedwait         sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait_time32
 178  common     rt_sigqueueinfo         sys_rt_sigqueueinfo             compat_sys_rt_sigqueueinfo
 179  common     rt_sigsuspend           sys_rt_sigsuspend               compat_sys_rt_sigsuspend
 180  common     pread64                 sys_pread64                     compat_sys_s390_pread64
@@ -246,13 +246,13 @@
 235  common     fremovexattr            sys_fremovexattr                sys_fremovexattr
 236  common     gettid                  sys_gettid                      sys_gettid
 237  common     tkill                   sys_tkill                       sys_tkill
-238  common     futex                   sys_futex                       compat_sys_futex
+238  common     futex                   sys_futex                       sys_futex_time32
 239  common     sched_setaffinity       sys_sched_setaffinity           compat_sys_sched_setaffinity
 240  common     sched_getaffinity       sys_sched_getaffinity           compat_sys_sched_getaffinity
 241  common     tgkill                  sys_tgkill                      sys_tgkill
 243  common     io_setup                sys_io_setup                    compat_sys_io_setup
 244  common     io_destroy              sys_io_destroy                  sys_io_destroy
-245  common     io_getevents            sys_io_getevents                compat_sys_io_getevents
+245  common     io_getevents            sys_io_getevents                sys_io_getevents_time32
 246  common     io_submit               sys_io_submit                   compat_sys_io_submit
 247  common     io_cancel               sys_io_cancel                   sys_io_cancel
 248  common     exit_group              sys_exit_group                  sys_exit_group
@@ -262,14 +262,14 @@
 252  common     set_tid_address         sys_set_tid_address             sys_set_tid_address
 253  common     fadvise64               sys_fadvise64_64                compat_sys_s390_fadvise64
 254  common     timer_create            sys_timer_create                compat_sys_timer_create
-255  common     timer_settime           sys_timer_settime               compat_sys_timer_settime
-256  common     timer_gettime           sys_timer_gettime               compat_sys_timer_gettime
+255  common     timer_settime           sys_timer_settime               sys_timer_settime32
+256  common     timer_gettime           sys_timer_gettime               sys_timer_gettime32
 257  common     timer_getoverrun        sys_timer_getoverrun            sys_timer_getoverrun
 258  common     timer_delete            sys_timer_delete                sys_timer_delete
-259  common     clock_settime           sys_clock_settime               compat_sys_clock_settime
-260  common     clock_gettime           sys_clock_gettime               compat_sys_clock_gettime
-261  common     clock_getres            sys_clock_getres                compat_sys_clock_getres
-262  common     clock_nanosleep         sys_clock_nanosleep             compat_sys_clock_nanosleep
+259  common     clock_settime           sys_clock_settime               sys_clock_settime32
+260  common     clock_gettime           sys_clock_gettime               sys_clock_gettime32
+261  common     clock_getres            sys_clock_getres                sys_clock_getres_time32
+262  common     clock_nanosleep         sys_clock_nanosleep             sys_clock_nanosleep_time32
 264  32         fadvise64_64            -                               compat_sys_s390_fadvise64_64
 265  common     statfs64                sys_statfs64                    compat_sys_statfs64
 266  common     fstatfs64               sys_fstatfs64                   compat_sys_fstatfs64
@@ -279,8 +279,8 @@
 270  common     set_mempolicy           sys_set_mempolicy               compat_sys_set_mempolicy
 271  common     mq_open                 sys_mq_open                     compat_sys_mq_open
 272  common     mq_unlink               sys_mq_unlink                   sys_mq_unlink
-273  common     mq_timedsend            sys_mq_timedsend                compat_sys_mq_timedsend
-274  common     mq_timedreceive         sys_mq_timedreceive             compat_sys_mq_timedreceive
+273  common     mq_timedsend            sys_mq_timedsend                sys_mq_timedsend_time32
+274  common     mq_timedreceive         sys_mq_timedreceive             sys_mq_timedreceive_time32
 275  common     mq_notify               sys_mq_notify                   compat_sys_mq_notify
 276  common     mq_getsetattr           sys_mq_getsetattr               compat_sys_mq_getsetattr
 277  common     kexec_load              sys_kexec_load                  compat_sys_kexec_load
@@ -298,7 +298,7 @@
 289  common     mkdirat                 sys_mkdirat                     sys_mkdirat
 290  common     mknodat                 sys_mknodat                     sys_mknodat
 291  common     fchownat                sys_fchownat                    sys_fchownat
-292  common     futimesat               sys_futimesat                   compat_sys_futimesat
+292  common     futimesat               sys_futimesat                   sys_futimesat_time32
 293  32         fstatat64               -                               compat_sys_s390_fstatat64
 293  64         newfstatat              sys_newfstatat                  -
 294  common     unlinkat                sys_unlinkat                    sys_unlinkat
@@ -308,8 +308,8 @@
 298  common     readlinkat              sys_readlinkat                  sys_readlinkat
 299  common     fchmodat                sys_fchmodat                    sys_fchmodat
 300  common     faccessat               sys_faccessat                   sys_faccessat
-301  common     pselect6                sys_pselect6                    compat_sys_pselect6
-302  common     ppoll                   sys_ppoll                       compat_sys_ppoll
+301  common     pselect6                sys_pselect6                    compat_sys_pselect6_time32
+302  common     ppoll                   sys_ppoll                       compat_sys_ppoll_time32
 303  common     unshare                 sys_unshare                     sys_unshare
 304  common     set_robust_list         sys_set_robust_list             compat_sys_set_robust_list
 305  common     get_robust_list         sys_get_robust_list             compat_sys_get_robust_list
@@ -320,15 +320,15 @@
 310  common     move_pages              sys_move_pages                  compat_sys_move_pages
 311  common     getcpu                  sys_getcpu                      sys_getcpu
 312  common     epoll_pwait             sys_epoll_pwait                 compat_sys_epoll_pwait
-313  common     utimes                  sys_utimes                      compat_sys_utimes
+313  common     utimes                  sys_utimes                      sys_utimes_time32
 314  common     fallocate               sys_fallocate                   compat_sys_s390_fallocate
-315  common     utimensat               sys_utimensat                   compat_sys_utimensat
+315  common     utimensat               sys_utimensat                   sys_utimensat_time32
 316  common     signalfd                sys_signalfd                    compat_sys_signalfd
 317  common     timerfd                 -                               -
 318  common     eventfd                 sys_eventfd                     sys_eventfd
 319  common     timerfd_create          sys_timerfd_create              sys_timerfd_create
-320  common     timerfd_settime         sys_timerfd_settime             compat_sys_timerfd_settime
-321  common     timerfd_gettime         sys_timerfd_gettime             compat_sys_timerfd_gettime
+320  common     timerfd_settime         sys_timerfd_settime             sys_timerfd_settime32
+321  common     timerfd_gettime         sys_timerfd_gettime             sys_timerfd_gettime32
 322  common     signalfd4               sys_signalfd4                   compat_sys_signalfd4
 323  common     eventfd2                sys_eventfd2                    sys_eventfd2
 324  common     inotify_init1           sys_inotify_init1               sys_inotify_init1
@@ -344,7 +344,7 @@
 334  common     prlimit64               sys_prlimit64                   sys_prlimit64
 335  common     name_to_handle_at       sys_name_to_handle_at           sys_name_to_handle_at
 336  common     open_by_handle_at       sys_open_by_handle_at           compat_sys_open_by_handle_at
-337  common     clock_adjtime           sys_clock_adjtime               compat_sys_clock_adjtime
+337  common     clock_adjtime           sys_clock_adjtime               sys_clock_adjtime32
 338  common     syncfs                  sys_syncfs                      sys_syncfs
 339  common     setns                   sys_setns                       sys_setns
 340  common     process_vm_readv        sys_process_vm_readv            compat_sys_process_vm_readv
@@ -364,7 +364,7 @@
 354  common     execveat                sys_execveat                    compat_sys_execveat
 355  common     userfaultfd             sys_userfaultfd                 sys_userfaultfd
 356  common     membarrier              sys_membarrier                  sys_membarrier
-357  common     recvmmsg                sys_recvmmsg                    compat_sys_recvmmsg
+357  common     recvmmsg                sys_recvmmsg                    compat_sys_recvmmsg_time32
 358  common     sendmmsg                sys_sendmmsg                    compat_sys_sendmmsg
 359  common     socket                  sys_socket                      sys_socket
 360  common     socketpair              sys_socketpair                  sys_socketpair
@@ -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/include/asm/unistd.h b/arch/sh/include/asm/unistd.h
index a97f93ca3bd7..9c7d9d9999c6 100644
--- a/arch/sh/include/asm/unistd.h
+++ b/arch/sh/include/asm/unistd.h
@@ -16,8 +16,8 @@
 # define __ARCH_WANT_SYS_IPC
 # define __ARCH_WANT_SYS_PAUSE
 # define __ARCH_WANT_SYS_SIGNAL
-# define __ARCH_WANT_SYS_TIME
-# define __ARCH_WANT_SYS_UTIME
+# define __ARCH_WANT_SYS_TIME32
+# define __ARCH_WANT_SYS_UTIME32
 # define __ARCH_WANT_SYS_WAITPID
 # define __ARCH_WANT_SYS_SOCKETCALL
 # define __ARCH_WANT_SYS_FADVISE64
diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl
index cafa63c6a932..bfda678576e4 100644
--- a/arch/sh/kernel/syscalls/syscall.tbl
+++ b/arch/sh/kernel/syscalls/syscall.tbl
@@ -20,7 +20,7 @@
 10      common  unlink                          sys_unlink
 11      common  execve                          sys_execve
 12      common  chdir                           sys_chdir
-13      common  time                            sys_time
+13      common  time                            sys_time32
 14      common  mknod                           sys_mknod
 15      common  chmod                           sys_chmod
 16      common  lchown                          sys_lchown16
@@ -32,12 +32,12 @@
 22      common  umount                          sys_oldumount
 23      common  setuid                          sys_setuid16
 24      common  getuid                          sys_getuid16
-25      common  stime                           sys_stime
+25      common  stime                           sys_stime32
 26      common  ptrace                          sys_ptrace
 27      common  alarm                           sys_alarm
 28      common  oldfstat                        sys_fstat
 29      common  pause                           sys_pause
-30      common  utime                           sys_utime
+30      common  utime                           sys_utime32
 # 31 was stty
 # 32 was gtty
 33      common  access                          sys_access
@@ -131,7 +131,7 @@
 121     common  setdomainname                   sys_setdomainname
 122     common  uname                           sys_newuname
 123     common  cacheflush                      sys_cacheflush
-124     common  adjtimex                        sys_adjtimex
+124     common  adjtimex                        sys_adjtimex_time32
 125     common  mprotect                        sys_mprotect
 126     common  sigprocmask                     sys_sigprocmask
 # 127 was create_module
@@ -168,8 +168,8 @@
 158     common  sched_yield                     sys_sched_yield
 159     common  sched_get_priority_max          sys_sched_get_priority_max
 160     common  sched_get_priority_min          sys_sched_get_priority_min
-161     common  sched_rr_get_interval           sys_sched_rr_get_interval
-162     common  nanosleep                       sys_nanosleep
+161     common  sched_rr_get_interval           sys_sched_rr_get_interval_time32
+162     common  nanosleep                       sys_nanosleep_time32
 163     common  mremap                          sys_mremap
 164     common  setresuid                       sys_setresuid16
 165     common  getresuid                       sys_getresuid16
@@ -184,7 +184,7 @@
 174     common  rt_sigaction                    sys_rt_sigaction
 175     common  rt_sigprocmask                  sys_rt_sigprocmask
 176     common  rt_sigpending                   sys_rt_sigpending
-177     common  rt_sigtimedwait                 sys_rt_sigtimedwait
+177     common  rt_sigtimedwait                 sys_rt_sigtimedwait_time32
 178     common  rt_sigqueueinfo                 sys_rt_sigqueueinfo
 179     common  rt_sigsuspend                   sys_rt_sigsuspend
 180     common  pread64                         sys_pread_wrapper
@@ -247,14 +247,14 @@
 237     common  fremovexattr                    sys_fremovexattr
 238     common  tkill                           sys_tkill
 239     common  sendfile64                      sys_sendfile64
-240     common  futex                           sys_futex
+240     common  futex                           sys_futex_time32
 241     common  sched_setaffinity               sys_sched_setaffinity
 242     common  sched_getaffinity               sys_sched_getaffinity
 # 243 is reserved for set_thread_area
 # 244 is reserved for get_thread_area
 245     common  io_setup                        sys_io_setup
 246     common  io_destroy                      sys_io_destroy
-247     common  io_getevents                    sys_io_getevents
+247     common  io_getevents                    sys_io_getevents_time32
 248     common  io_submit                       sys_io_submit
 249     common  io_cancel                       sys_io_cancel
 250     common  fadvise64                       sys_fadvise64
@@ -267,18 +267,18 @@
 257     common  remap_file_pages                sys_remap_file_pages
 258     common  set_tid_address                 sys_set_tid_address
 259     common  timer_create                    sys_timer_create
-260     common  timer_settime                   sys_timer_settime
-261     common  timer_gettime                   sys_timer_gettime
+260     common  timer_settime                   sys_timer_settime32
+261     common  timer_gettime                   sys_timer_gettime32
 262     common  timer_getoverrun                sys_timer_getoverrun
 263     common  timer_delete                    sys_timer_delete
-264     common  clock_settime                   sys_clock_settime
-265     common  clock_gettime                   sys_clock_gettime
-266     common  clock_getres                    sys_clock_getres
-267     common  clock_nanosleep                 sys_clock_nanosleep
+264     common  clock_settime                   sys_clock_settime32
+265     common  clock_gettime                   sys_clock_gettime32
+266     common  clock_getres                    sys_clock_getres_time32
+267     common  clock_nanosleep                 sys_clock_nanosleep_time32
 268     common  statfs64                        sys_statfs64
 269     common  fstatfs64                       sys_fstatfs64
 270     common  tgkill                          sys_tgkill
-271     common  utimes                          sys_utimes
+271     common  utimes                          sys_utimes_time32
 272     common  fadvise64_64                    sys_fadvise64_64_wrapper
 # 273 is reserved for vserver
 274     common  mbind                           sys_mbind
@@ -286,8 +286,8 @@
 276     common  set_mempolicy                   sys_set_mempolicy
 277     common  mq_open                         sys_mq_open
 278     common  mq_unlink                       sys_mq_unlink
-279     common  mq_timedsend                    sys_mq_timedsend
-280     common  mq_timedreceive                 sys_mq_timedreceive
+279     common  mq_timedsend                    sys_mq_timedsend_time32
+280     common  mq_timedreceive                 sys_mq_timedreceive_time32
 281     common  mq_notify                       sys_mq_notify
 282     common  mq_getsetattr                   sys_mq_getsetattr
 283     common  kexec_load                      sys_kexec_load
@@ -306,7 +306,7 @@
 296     common  mkdirat                         sys_mkdirat
 297     common  mknodat                         sys_mknodat
 298     common  fchownat                        sys_fchownat
-299     common  futimesat                       sys_futimesat
+299     common  futimesat                       sys_futimesat_time32
 300     common  fstatat64                       sys_fstatat64
 301     common  unlinkat                        sys_unlinkat
 302     common  renameat                        sys_renameat
@@ -315,8 +315,8 @@
 305     common  readlinkat                      sys_readlinkat
 306     common  fchmodat                        sys_fchmodat
 307     common  faccessat                       sys_faccessat
-308     common  pselect6                        sys_pselect6
-309     common  ppoll                           sys_ppoll
+308     common  pselect6                        sys_pselect6_time32
+309     common  ppoll                           sys_ppoll_time32
 310     common  unshare                         sys_unshare
 311     common  set_robust_list                 sys_set_robust_list
 312     common  get_robust_list                 sys_get_robust_list
@@ -327,13 +327,13 @@
 317     common  move_pages                      sys_move_pages
 318     common  getcpu                          sys_getcpu
 319     common  epoll_pwait                     sys_epoll_pwait
-320     common  utimensat                       sys_utimensat
+320     common  utimensat                       sys_utimensat_time32
 321     common  signalfd                        sys_signalfd
 322     common  timerfd_create                  sys_timerfd_create
 323     common  eventfd                         sys_eventfd
 324     common  fallocate                       sys_fallocate
-325     common  timerfd_settime                 sys_timerfd_settime
-326     common  timerfd_gettime                 sys_timerfd_gettime
+325     common  timerfd_settime                 sys_timerfd_settime32
+326     common  timerfd_gettime                 sys_timerfd_gettime32
 327     common  signalfd4                       sys_signalfd4
 328     common  eventfd2                        sys_eventfd2
 329     common  epoll_create1                   sys_epoll_create1
@@ -364,11 +364,11 @@
 354     common  getsockopt                      sys_getsockopt
 355     common  sendmsg                         sys_sendmsg
 356     common  recvmsg                         sys_recvmsg
-357     common  recvmmsg                        sys_recvmmsg
+357     common  recvmmsg                        sys_recvmmsg_time32
 358     common  accept4                         sys_accept4
 359     common  name_to_handle_at               sys_name_to_handle_at
 360     common  open_by_handle_at               sys_open_by_handle_at
-361     common  clock_adjtime                   sys_clock_adjtime
+361     common  clock_adjtime                   sys_clock_adjtime32
 362     common  syncfs                          sys_syncfs
 363     common  sendmmsg                        sys_sendmmsg
 364     common  setns                           sys_setns
@@ -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/include/asm/unistd.h b/arch/sparc/include/asm/unistd.h
index 08696ea5dca8..1e66278ba4a5 100644
--- a/arch/sparc/include/asm/unistd.h
+++ b/arch/sparc/include/asm/unistd.h
@@ -30,8 +30,8 @@
 #define __ARCH_WANT_SYS_GETHOSTNAME
 #define __ARCH_WANT_SYS_PAUSE
 #define __ARCH_WANT_SYS_SIGNAL
-#define __ARCH_WANT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_TIME32
+#define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_WAITPID
 #define __ARCH_WANT_SYS_SOCKETCALL
 #define __ARCH_WANT_SYS_FADVISE64
@@ -43,8 +43,8 @@
 #ifdef __32bit_syscall_numbers__
 #define __ARCH_WANT_SYS_IPC
 #else
-#define __ARCH_WANT_COMPAT_SYS_TIME
-#define __ARCH_WANT_SYS_UTIME32
+#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_UTIME
 #define __ARCH_WANT_COMPAT_SYS_SENDFILE
 #endif
 
diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
index 1c079e7bab09..9825ca6a6020 100644
--- a/arch/sparc/kernel/sys_sparc_64.c
+++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -28,8 +28,9 @@
 #include <linux/random.h>
 #include <linux/export.h>
 #include <linux/context_tracking.h>
-
+#include <linux/timex.h>
 #include <linux/uaccess.h>
+
 #include <asm/utrap.h>
 #include <asm/unistd.h>
 
@@ -544,6 +545,62 @@ out_unlock:
         return err;
 }
 
+SYSCALL_DEFINE1(sparc_adjtimex, struct timex __user *, txc_p)
+{
+        struct timex txc;               /* Local copy of parameter */
+        struct __kernel_timex *kt = (void *)&txc;
+        int ret;
+
+        /* Copy the user data space into the kernel copy
+         * structure. But bear in mind that the structures
+         * may change
+         */
+        if (copy_from_user(&txc, txc_p, sizeof(struct timex)))
+                return -EFAULT;
+
+        /*
+         * override for sparc64 specific timeval type: tv_usec
+         * is 32 bit wide instead of 64-bit in __kernel_timex
+         */
+        kt->time.tv_usec = txc.time.tv_usec;
+        ret = do_adjtimex(kt);
+        txc.time.tv_usec = kt->time.tv_usec;
+
+        return copy_to_user(txc_p, &txc, sizeof(struct timex)) ? -EFAULT : ret;
+}
+
+SYSCALL_DEFINE2(sparc_clock_adjtime, const clockid_t, which_clock,struct timex __user *, txc_p)
+{
+        struct timex txc;               /* Local copy of parameter */
+        struct __kernel_timex *kt = (void *)&txc;
+        int ret;
+
+        if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) {
+                pr_err_once("process %d (%s) attempted a POSIX timer syscall "
+                    "while CONFIG_POSIX_TIMERS is not set\n",
+                    current->pid, current->comm);
+
+                return -ENOSYS;
+        }
+
+        /* Copy the user data space into the kernel copy
+         * structure. But bear in mind that the structures
+         * may change
+         */
+        if (copy_from_user(&txc, txc_p, sizeof(struct timex)))
+                return -EFAULT;
+
+        /*
+         * override for sparc64 specific timeval type: tv_usec
+         * is 32 bit wide instead of 64-bit in __kernel_timex
+         */
+        kt->time.tv_usec = txc.time.tv_usec;
+        ret = do_clock_adjtime(which_clock, kt);
+        txc.time.tv_usec = kt->time.tv_usec;
+
+        return copy_to_user(txc_p, &txc, sizeof(struct timex)) ? -EFAULT : ret;
+}
+
 SYSCALL_DEFINE5(utrap_install, utrap_entry_t, type,
                 utrap_handler_t, new_p, utrap_handler_t, new_d,
                 utrap_handler_t __user *, old_p,
diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl
index 6992d17cce37..b9a5a04b2d2c 100644
--- a/arch/sparc/kernel/syscalls/syscall.tbl
+++ b/arch/sparc/kernel/syscalls/syscall.tbl
@@ -44,7 +44,8 @@
 28      common  sigaltstack             sys_sigaltstack                 compat_sys_sigaltstack
 29      32      pause                   sys_pause
 29      64      pause                   sys_nis_syscall
-30      common  utime                   sys_utime                       compat_sys_utime
+30      32      utime                   sys_utime32
+30      64      utime                   sys_utime
 31      32      lchown32                sys_lchown
 32      32      fchown32                sys_fchown
 33      common  access                  sys_access
@@ -128,7 +129,8 @@
 102     common  rt_sigaction            sys_rt_sigaction                compat_sys_rt_sigaction
 103     common  rt_sigprocmask          sys_rt_sigprocmask              compat_sys_rt_sigprocmask
 104     common  rt_sigpending           sys_rt_sigpending               compat_sys_rt_sigpending
-105     common  rt_sigtimedwait         sys_rt_sigtimedwait             compat_sys_rt_sigtimedwait
+105     32      rt_sigtimedwait         sys_rt_sigtimedwait_time32      compat_sys_rt_sigtimedwait_time32
+105     64      rt_sigtimedwait         sys_rt_sigtimedwait
 106     common  rt_sigqueueinfo         sys_rt_sigqueueinfo             compat_sys_rt_sigqueueinfo
 107     common  rt_sigsuspend           sys_rt_sigsuspend               compat_sys_rt_sigsuspend
 108     32      setresuid32             sys_setresuid
@@ -168,11 +170,13 @@
 135     common  socketpair              sys_socketpair
 136     common  mkdir                   sys_mkdir
 137     common  rmdir                   sys_rmdir
-138     common  utimes                  sys_utimes                      compat_sys_utimes
+138     32      utimes                  sys_utimes_time32
+138     64      utimes                  sys_utimes
 139     common  stat64                  sys_stat64                      compat_sys_stat64
 140     common  sendfile64              sys_sendfile64
 141     common  getpeername             sys_getpeername
-142     common  futex                   sys_futex                       compat_sys_futex
+142     32      futex                   sys_futex_time32
+142     64      futex                   sys_futex
 143     common  gettid                  sys_gettid
 144     common  getrlimit               sys_getrlimit                   compat_sys_getrlimit
 145     common  setrlimit               sys_setrlimit                   compat_sys_setrlimit
@@ -258,7 +262,8 @@
 216     64      sigreturn               sys_nis_syscall
 217     common  clone                   sys_clone
 218     common  ioprio_get              sys_ioprio_get
-219     common  adjtimex                sys_adjtimex                    compat_sys_adjtimex
+219     32      adjtimex                sys_adjtimex_time32
+219     64      adjtimex                sys_sparc_adjtimex
 220     32      sigprocmask             sys_sigprocmask                 compat_sys_sigprocmask
 220     64      sigprocmask             sys_nis_syscall
 221     common  create_module           sys_ni_syscall
@@ -271,9 +276,10 @@
 228     common  setfsuid                sys_setfsuid16
 229     common  setfsgid                sys_setfsgid16
 230     common  _newselect              sys_select                      compat_sys_select
-231     32      time                    sys_time                        compat_sys_time
+231     32      time                    sys_time32
 232     common  splice                  sys_splice
-233     common  stime                   sys_stime                       compat_sys_stime
+233     32      stime                   sys_stime32
+233     64      stime                   sys_stime
 234     common  statfs64                sys_statfs64                    compat_sys_statfs64
 235     common  fstatfs64               sys_fstatfs64                   compat_sys_fstatfs64
 236     common  _llseek                 sys_llseek
@@ -288,8 +294,10 @@
 245     common  sched_yield             sys_sched_yield
 246     common  sched_get_priority_max  sys_sched_get_priority_max
 247     common  sched_get_priority_min  sys_sched_get_priority_min
-248     common  sched_rr_get_interval   sys_sched_rr_get_interval       compat_sys_sched_rr_get_interval
-249     common  nanosleep               sys_nanosleep                   compat_sys_nanosleep
+248     32      sched_rr_get_interval   sys_sched_rr_get_interval_time32
+248     64      sched_rr_get_interval   sys_sched_rr_get_interval
+249     32      nanosleep               sys_nanosleep_time32
+249     64      nanosleep               sys_nanosleep
 250     32      mremap                  sys_mremap
 250     64      mremap                  sys_64_mremap
 251     common  _sysctl                 sys_sysctl                      compat_sys_sysctl
@@ -298,14 +306,20 @@
 254     32      nfsservctl              sys_ni_syscall                  sys_nis_syscall
 254     64      nfsservctl              sys_nis_syscall
 255     common  sync_file_range         sys_sync_file_range             compat_sys_sync_file_range
-256     common  clock_settime           sys_clock_settime               compat_sys_clock_settime
-257     common  clock_gettime           sys_clock_gettime               compat_sys_clock_gettime
-258     common  clock_getres            sys_clock_getres                compat_sys_clock_getres
-259     common  clock_nanosleep         sys_clock_nanosleep             compat_sys_clock_nanosleep
+256     32      clock_settime           sys_clock_settime32
+256     64      clock_settime           sys_clock_settime
+257     32      clock_gettime           sys_clock_gettime32
+257     64      clock_gettime           sys_clock_gettime
+258     32      clock_getres            sys_clock_getres_time32
+258     64      clock_getres            sys_clock_getres
+259     32      clock_nanosleep         sys_clock_nanosleep_time32
+259     64      clock_nanosleep         sys_clock_nanosleep
 260     common  sched_getaffinity       sys_sched_getaffinity           compat_sys_sched_getaffinity
 261     common  sched_setaffinity       sys_sched_setaffinity           compat_sys_sched_setaffinity
-262     common  timer_settime           sys_timer_settime               compat_sys_timer_settime
-263     common  timer_gettime           sys_timer_gettime               compat_sys_timer_gettime
+262     32      timer_settime           sys_timer_settime32
+262     64      timer_settime           sys_timer_settime
+263     32      timer_gettime           sys_timer_gettime32
+263     64      timer_gettime           sys_timer_gettime
 264     common  timer_getoverrun        sys_timer_getoverrun
 265     common  timer_delete            sys_timer_delete
 266     common  timer_create            sys_timer_create                compat_sys_timer_create
@@ -315,11 +329,14 @@
 269     common  io_destroy              sys_io_destroy
 270     common  io_submit               sys_io_submit                   compat_sys_io_submit
 271     common  io_cancel               sys_io_cancel
-272     common  io_getevents            sys_io_getevents                compat_sys_io_getevents
+272     32      io_getevents            sys_io_getevents_time32
+272     64      io_getevents            sys_io_getevents
 273     common  mq_open                 sys_mq_open                     compat_sys_mq_open
 274     common  mq_unlink               sys_mq_unlink
-275     common  mq_timedsend            sys_mq_timedsend                compat_sys_mq_timedsend
-276     common  mq_timedreceive         sys_mq_timedreceive             compat_sys_mq_timedreceive
+275     32      mq_timedsend            sys_mq_timedsend_time32
+275     64      mq_timedsend            sys_mq_timedsend
+276     32      mq_timedreceive         sys_mq_timedreceive_time32
+276     64      mq_timedreceive         sys_mq_timedreceive
 277     common  mq_notify               sys_mq_notify                   compat_sys_mq_notify
 278     common  mq_getsetattr           sys_mq_getsetattr               compat_sys_mq_getsetattr
 279     common  waitid                  sys_waitid                      compat_sys_waitid
@@ -331,7 +348,8 @@
 285     common  mkdirat                 sys_mkdirat
 286     common  mknodat                 sys_mknodat
 287     common  fchownat                sys_fchownat
-288     common  futimesat               sys_futimesat                   compat_sys_futimesat
+288     32      futimesat               sys_futimesat_time32
+288     64      futimesat               sys_futimesat
 289     common  fstatat64               sys_fstatat64                   compat_sys_fstatat64
 290     common  unlinkat                sys_unlinkat
 291     common  renameat                sys_renameat
@@ -340,8 +358,10 @@
 294     common  readlinkat              sys_readlinkat
 295     common  fchmodat                sys_fchmodat
 296     common  faccessat               sys_faccessat
-297     common  pselect6                sys_pselect6                    compat_sys_pselect6
-298     common  ppoll                   sys_ppoll                       compat_sys_ppoll
+297     32      pselect6                sys_pselect6_time32             compat_sys_pselect6_time32
+297     64      pselect6                sys_pselect6
+298     32      ppoll                   sys_ppoll_time32                compat_sys_ppoll_time32
+298     64      ppoll                   sys_ppoll
 299     common  unshare                 sys_unshare
 300     common  set_robust_list         sys_set_robust_list             compat_sys_set_robust_list
 301     common  get_robust_list         sys_get_robust_list             compat_sys_get_robust_list
@@ -353,13 +373,16 @@
 307     common  move_pages              sys_move_pages                  compat_sys_move_pages
 308     common  getcpu                  sys_getcpu
 309     common  epoll_pwait             sys_epoll_pwait                 compat_sys_epoll_pwait
-310     common  utimensat               sys_utimensat                   compat_sys_utimensat
+310     32      utimensat               sys_utimensat_time32
+310     64      utimensat               sys_utimensat
 311     common  signalfd                sys_signalfd                    compat_sys_signalfd
 312     common  timerfd_create          sys_timerfd_create
 313     common  eventfd                 sys_eventfd
 314     common  fallocate               sys_fallocate                   compat_sys_fallocate
-315     common  timerfd_settime         sys_timerfd_settime             compat_sys_timerfd_settime
-316     common  timerfd_gettime         sys_timerfd_gettime             compat_sys_timerfd_gettime
+315     32      timerfd_settime         sys_timerfd_settime32
+315     64      timerfd_settime         sys_timerfd_settime
+316     32      timerfd_gettime         sys_timerfd_gettime32
+316     64      timerfd_gettime         sys_timerfd_gettime
 317     common  signalfd4               sys_signalfd4                   compat_sys_signalfd4
 318     common  eventfd2                sys_eventfd2
 319     common  epoll_create1           sys_epoll_create1
@@ -371,13 +394,15 @@
 325     common  pwritev                 sys_pwritev                     compat_sys_pwritev
 326     common  rt_tgsigqueueinfo       sys_rt_tgsigqueueinfo           compat_sys_rt_tgsigqueueinfo
 327     common  perf_event_open         sys_perf_event_open
-328     common  recvmmsg                sys_recvmmsg                    compat_sys_recvmmsg
+328     32      recvmmsg                sys_recvmmsg_time32             compat_sys_recvmmsg_time32
+328     64      recvmmsg                sys_recvmmsg
 329     common  fanotify_init           sys_fanotify_init
 330     common  fanotify_mark           sys_fanotify_mark               compat_sys_fanotify_mark
 331     common  prlimit64               sys_prlimit64
 332     common  name_to_handle_at       sys_name_to_handle_at
 333     common  open_by_handle_at       sys_open_by_handle_at           compat_sys_open_by_handle_at
-334     common  clock_adjtime           sys_clock_adjtime               compat_sys_clock_adjtime
+334     32      clock_adjtime           sys_clock_adjtime32
+334     64      clock_adjtime           sys_sparc_clock_adjtime
 335     common  syncfs                  sys_syncfs
 336     common  sendmmsg                sys_sendmmsg                    compat_sys_sendmmsg
 337     common  setns                   sys_setns
@@ -406,7 +431,8 @@
 358     common  preadv2                 sys_preadv2                     compat_sys_preadv2
 359     common  pwritev2                sys_pwritev2                    compat_sys_pwritev2
 360     common  statx                   sys_statx
-361     common  io_pgetevents           sys_io_pgetevents               compat_sys_io_pgetevents
+361     32      io_pgetevents           sys_io_pgetevents_time32        compat_sys_io_pgetevents
+361     64      io_pgetevents           sys_io_pgetevents
 362     common  pkey_mprotect           sys_pkey_mprotect
 363     common  pkey_alloc              sys_pkey_alloc
 364     common  pkey_free               sys_pkey_free
@@ -423,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 2be1d0eb7754..955ab6a3b61f 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -24,7 +24,7 @@
 10      i386    unlink                  sys_unlink                      __ia32_sys_unlink
 11      i386    execve                  sys_execve                      __ia32_compat_sys_execve
 12      i386    chdir                   sys_chdir                       __ia32_sys_chdir
-13      i386    time                    sys_time                        __ia32_compat_sys_time
+13      i386    time                    sys_time32                      __ia32_sys_time32
 14      i386    mknod                   sys_mknod                       __ia32_sys_mknod
 15      i386    chmod                   sys_chmod                       __ia32_sys_chmod
 16      i386    lchown                  sys_lchown16                    __ia32_sys_lchown16
@@ -36,12 +36,12 @@
 22      i386    umount                  sys_oldumount                   __ia32_sys_oldumount
 23      i386    setuid                  sys_setuid16                    __ia32_sys_setuid16
 24      i386    getuid                  sys_getuid16                    __ia32_sys_getuid16
-25      i386    stime                   sys_stime                       __ia32_compat_sys_stime
+25      i386    stime                   sys_stime32                     __ia32_sys_stime32
 26      i386    ptrace                  sys_ptrace                      __ia32_compat_sys_ptrace
 27      i386    alarm                   sys_alarm                       __ia32_sys_alarm
 28      i386    oldfstat                sys_fstat                       __ia32_sys_fstat
 29      i386    pause                   sys_pause                       __ia32_sys_pause
-30      i386    utime                   sys_utime                       __ia32_compat_sys_utime
+30      i386    utime                   sys_utime32                     __ia32_sys_utime32
 31      i386    stty
 32      i386    gtty
 33      i386    access                  sys_access                      __ia32_sys_access
@@ -135,7 +135,7 @@
 121     i386    setdomainname           sys_setdomainname               __ia32_sys_setdomainname
 122     i386    uname                   sys_newuname                    __ia32_sys_newuname
 123     i386    modify_ldt              sys_modify_ldt                  __ia32_sys_modify_ldt
-124     i386    adjtimex                sys_adjtimex                    __ia32_compat_sys_adjtimex
+124     i386    adjtimex                sys_adjtimex_time32                     __ia32_sys_adjtimex_time32
 125     i386    mprotect                sys_mprotect                    __ia32_sys_mprotect
 126     i386    sigprocmask             sys_sigprocmask                 __ia32_compat_sys_sigprocmask
 127     i386    create_module
@@ -172,8 +172,8 @@
 158     i386    sched_yield             sys_sched_yield                 __ia32_sys_sched_yield
 159     i386    sched_get_priority_max  sys_sched_get_priority_max      __ia32_sys_sched_get_priority_max
 160     i386    sched_get_priority_min  sys_sched_get_priority_min      __ia32_sys_sched_get_priority_min
-161     i386    sched_rr_get_interval   sys_sched_rr_get_interval       __ia32_compat_sys_sched_rr_get_interval
-162     i386    nanosleep               sys_nanosleep                   __ia32_compat_sys_nanosleep
+161     i386    sched_rr_get_interval   sys_sched_rr_get_interval_time32        __ia32_sys_sched_rr_get_interval_time32
+162     i386    nanosleep               sys_nanosleep_time32            __ia32_sys_nanosleep_time32
 163     i386    mremap                  sys_mremap                      __ia32_sys_mremap
 164     i386    setresuid               sys_setresuid16                 __ia32_sys_setresuid16
 165     i386    getresuid               sys_getresuid16                 __ia32_sys_getresuid16
@@ -188,7 +188,7 @@
 174     i386    rt_sigaction            sys_rt_sigaction                __ia32_compat_sys_rt_sigaction
 175     i386    rt_sigprocmask          sys_rt_sigprocmask              __ia32_sys_rt_sigprocmask
 176     i386    rt_sigpending           sys_rt_sigpending               __ia32_compat_sys_rt_sigpending
-177     i386    rt_sigtimedwait         sys_rt_sigtimedwait             __ia32_compat_sys_rt_sigtimedwait
+177     i386    rt_sigtimedwait         sys_rt_sigtimedwait_time32      __ia32_compat_sys_rt_sigtimedwait_time32
 178     i386    rt_sigqueueinfo         sys_rt_sigqueueinfo             __ia32_compat_sys_rt_sigqueueinfo
 179     i386    rt_sigsuspend           sys_rt_sigsuspend               __ia32_sys_rt_sigsuspend
 180     i386    pread64                 sys_pread64                     __ia32_compat_sys_x86_pread
@@ -251,14 +251,14 @@
 237     i386    fremovexattr            sys_fremovexattr                __ia32_sys_fremovexattr
 238     i386    tkill                   sys_tkill                       __ia32_sys_tkill
 239     i386    sendfile64              sys_sendfile64                  __ia32_sys_sendfile64
-240     i386    futex                   sys_futex                       __ia32_compat_sys_futex
+240     i386    futex                   sys_futex_time32                __ia32_sys_futex_time32
 241     i386    sched_setaffinity       sys_sched_setaffinity           __ia32_compat_sys_sched_setaffinity
 242     i386    sched_getaffinity       sys_sched_getaffinity           __ia32_compat_sys_sched_getaffinity
 243     i386    set_thread_area         sys_set_thread_area             __ia32_sys_set_thread_area
 244     i386    get_thread_area         sys_get_thread_area             __ia32_sys_get_thread_area
 245     i386    io_setup                sys_io_setup                    __ia32_compat_sys_io_setup
 246     i386    io_destroy              sys_io_destroy                  __ia32_sys_io_destroy
-247     i386    io_getevents            sys_io_getevents                __ia32_compat_sys_io_getevents
+247     i386    io_getevents            sys_io_getevents_time32         __ia32_sys_io_getevents_time32
 248     i386    io_submit               sys_io_submit                   __ia32_compat_sys_io_submit
 249     i386    io_cancel               sys_io_cancel                   __ia32_sys_io_cancel
 250     i386    fadvise64               sys_fadvise64                   __ia32_compat_sys_x86_fadvise64
@@ -271,18 +271,18 @@
 257     i386    remap_file_pages        sys_remap_file_pages            __ia32_sys_remap_file_pages
 258     i386    set_tid_address         sys_set_tid_address             __ia32_sys_set_tid_address
 259     i386    timer_create            sys_timer_create                __ia32_compat_sys_timer_create
-260     i386    timer_settime           sys_timer_settime               __ia32_compat_sys_timer_settime
-261     i386    timer_gettime           sys_timer_gettime               __ia32_compat_sys_timer_gettime
+260     i386    timer_settime           sys_timer_settime32             __ia32_sys_timer_settime32
+261     i386    timer_gettime           sys_timer_gettime32             __ia32_sys_timer_gettime32
 262     i386    timer_getoverrun        sys_timer_getoverrun            __ia32_sys_timer_getoverrun
 263     i386    timer_delete            sys_timer_delete                __ia32_sys_timer_delete
-264     i386    clock_settime           sys_clock_settime               __ia32_compat_sys_clock_settime
-265     i386    clock_gettime           sys_clock_gettime               __ia32_compat_sys_clock_gettime
-266     i386    clock_getres            sys_clock_getres                __ia32_compat_sys_clock_getres
-267     i386    clock_nanosleep         sys_clock_nanosleep             __ia32_compat_sys_clock_nanosleep
+264     i386    clock_settime           sys_clock_settime32             __ia32_sys_clock_settime32
+265     i386    clock_gettime           sys_clock_gettime32             __ia32_sys_clock_gettime32
+266     i386    clock_getres            sys_clock_getres_time32         __ia32_sys_clock_getres_time32
+267     i386    clock_nanosleep         sys_clock_nanosleep_time32      __ia32_sys_clock_nanosleep_time32
 268     i386    statfs64                sys_statfs64                    __ia32_compat_sys_statfs64
 269     i386    fstatfs64               sys_fstatfs64                   __ia32_compat_sys_fstatfs64
 270     i386    tgkill                  sys_tgkill                      __ia32_sys_tgkill
-271     i386    utimes                  sys_utimes                      __ia32_compat_sys_utimes
+271     i386    utimes                  sys_utimes_time32               __ia32_sys_utimes_time32
 272     i386    fadvise64_64            sys_fadvise64_64                __ia32_compat_sys_x86_fadvise64_64
 273     i386    vserver
 274     i386    mbind                   sys_mbind                       __ia32_sys_mbind
@@ -290,8 +290,8 @@
 276     i386    set_mempolicy           sys_set_mempolicy               __ia32_sys_set_mempolicy
 277     i386    mq_open                 sys_mq_open                     __ia32_compat_sys_mq_open
 278     i386    mq_unlink               sys_mq_unlink                   __ia32_sys_mq_unlink
-279     i386    mq_timedsend            sys_mq_timedsend                __ia32_compat_sys_mq_timedsend
-280     i386    mq_timedreceive         sys_mq_timedreceive             __ia32_compat_sys_mq_timedreceive
+279     i386    mq_timedsend            sys_mq_timedsend_time32         __ia32_sys_mq_timedsend_time32
+280     i386    mq_timedreceive         sys_mq_timedreceive_time32      __ia32_sys_mq_timedreceive_time32
 281     i386    mq_notify               sys_mq_notify                   __ia32_compat_sys_mq_notify
 282     i386    mq_getsetattr           sys_mq_getsetattr               __ia32_compat_sys_mq_getsetattr
 283     i386    kexec_load              sys_kexec_load                  __ia32_compat_sys_kexec_load
@@ -310,7 +310,7 @@
 296     i386    mkdirat                 sys_mkdirat                     __ia32_sys_mkdirat
 297     i386    mknodat                 sys_mknodat                     __ia32_sys_mknodat
 298     i386    fchownat                sys_fchownat                    __ia32_sys_fchownat
-299     i386    futimesat               sys_futimesat                   __ia32_compat_sys_futimesat
+299     i386    futimesat               sys_futimesat_time32            __ia32_sys_futimesat_time32
 300     i386    fstatat64               sys_fstatat64                   __ia32_compat_sys_x86_fstatat
 301     i386    unlinkat                sys_unlinkat                    __ia32_sys_unlinkat
 302     i386    renameat                sys_renameat                    __ia32_sys_renameat
@@ -319,8 +319,8 @@
 305     i386    readlinkat              sys_readlinkat                  __ia32_sys_readlinkat
 306     i386    fchmodat                sys_fchmodat                    __ia32_sys_fchmodat
 307     i386    faccessat               sys_faccessat                   __ia32_sys_faccessat
-308     i386    pselect6                sys_pselect6                    __ia32_compat_sys_pselect6
-309     i386    ppoll                   sys_ppoll                       __ia32_compat_sys_ppoll
+308     i386    pselect6                sys_pselect6_time32             __ia32_compat_sys_pselect6_time32
+309     i386    ppoll                   sys_ppoll_time32                __ia32_compat_sys_ppoll_time32
 310     i386    unshare                 sys_unshare                     __ia32_sys_unshare
 311     i386    set_robust_list         sys_set_robust_list             __ia32_compat_sys_set_robust_list
 312     i386    get_robust_list         sys_get_robust_list             __ia32_compat_sys_get_robust_list
@@ -331,13 +331,13 @@
 317     i386    move_pages              sys_move_pages                  __ia32_compat_sys_move_pages
 318     i386    getcpu                  sys_getcpu                      __ia32_sys_getcpu
 319     i386    epoll_pwait             sys_epoll_pwait                 __ia32_sys_epoll_pwait
-320     i386    utimensat               sys_utimensat                   __ia32_compat_sys_utimensat
+320     i386    utimensat               sys_utimensat_time32            __ia32_sys_utimensat_time32
 321     i386    signalfd                sys_signalfd                    __ia32_compat_sys_signalfd
 322     i386    timerfd_create          sys_timerfd_create              __ia32_sys_timerfd_create
 323     i386    eventfd                 sys_eventfd                     __ia32_sys_eventfd
 324     i386    fallocate               sys_fallocate                   __ia32_compat_sys_x86_fallocate
-325     i386    timerfd_settime         sys_timerfd_settime             __ia32_compat_sys_timerfd_settime
-326     i386    timerfd_gettime         sys_timerfd_gettime             __ia32_compat_sys_timerfd_gettime
+325     i386    timerfd_settime         sys_timerfd_settime32           __ia32_sys_timerfd_settime32
+326     i386    timerfd_gettime         sys_timerfd_gettime32           __ia32_sys_timerfd_gettime32
 327     i386    signalfd4               sys_signalfd4                   __ia32_compat_sys_signalfd4
 328     i386    eventfd2                sys_eventfd2                    __ia32_sys_eventfd2
 329     i386    epoll_create1           sys_epoll_create1               __ia32_sys_epoll_create1
@@ -348,13 +348,13 @@
 334     i386    pwritev                 sys_pwritev                     __ia32_compat_sys_pwritev
 335     i386    rt_tgsigqueueinfo       sys_rt_tgsigqueueinfo           __ia32_compat_sys_rt_tgsigqueueinfo
 336     i386    perf_event_open         sys_perf_event_open             __ia32_sys_perf_event_open
-337     i386    recvmmsg                sys_recvmmsg                    __ia32_compat_sys_recvmmsg
+337     i386    recvmmsg                sys_recvmmsg_time32             __ia32_compat_sys_recvmmsg_time32
 338     i386    fanotify_init           sys_fanotify_init               __ia32_sys_fanotify_init
 339     i386    fanotify_mark           sys_fanotify_mark               __ia32_compat_sys_fanotify_mark
 340     i386    prlimit64               sys_prlimit64                   __ia32_sys_prlimit64
 341     i386    name_to_handle_at       sys_name_to_handle_at           __ia32_sys_name_to_handle_at
 342     i386    open_by_handle_at       sys_open_by_handle_at           __ia32_compat_sys_open_by_handle_at
-343     i386    clock_adjtime           sys_clock_adjtime               __ia32_compat_sys_clock_adjtime
+343     i386    clock_adjtime           sys_clock_adjtime32             __ia32_sys_clock_adjtime32
 344     i386    syncfs                  sys_syncfs                      __ia32_sys_syncfs
 345     i386    sendmmsg                sys_sendmmsg                    __ia32_compat_sys_sendmmsg
 346     i386    setns                   sys_setns                       __ia32_sys_setns
@@ -396,7 +396,7 @@
 382     i386    pkey_free               sys_pkey_free                   __ia32_sys_pkey_free
 383     i386    statx                   sys_statx                       __ia32_sys_statx
 384     i386    arch_prctl              sys_arch_prctl                  __ia32_compat_sys_arch_prctl
-385     i386    io_pgetevents           sys_io_pgetevents               __ia32_compat_sys_io_pgetevents
+385     i386    io_pgetevents           sys_io_pgetevents_time32        __ia32_compat_sys_io_pgetevents
 386     i386    rseq                    sys_rseq                        __ia32_sys_rseq
 # don't use numbers 387 through 392, add new calls at the end
 393     i386    semget                  sys_semget                      __ia32_sys_semget
@@ -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/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl
index 9d8128ef50a9..2ae92fddb6d5 100644
--- a/arch/x86/entry/syscalls/syscall_64.tbl
+++ b/arch/x86/entry/syscalls/syscall_64.tbl
@@ -363,7 +363,7 @@
 520     x32     execve                  __x32_compat_sys_execve/ptregs
 521     x32     ptrace                  __x32_compat_sys_ptrace
 522     x32     rt_sigpending           __x32_compat_sys_rt_sigpending
-523     x32     rt_sigtimedwait         __x32_compat_sys_rt_sigtimedwait
+523     x32     rt_sigtimedwait         __x32_compat_sys_rt_sigtimedwait_time64
 524     x32     rt_sigqueueinfo         __x32_compat_sys_rt_sigqueueinfo
 525     x32     sigaltstack             __x32_compat_sys_sigaltstack
 526     x32     timer_create            __x32_compat_sys_timer_create
@@ -377,7 +377,7 @@
 534     x32     preadv                  __x32_compat_sys_preadv64
 535     x32     pwritev                 __x32_compat_sys_pwritev64
 536     x32     rt_tgsigqueueinfo       __x32_compat_sys_rt_tgsigqueueinfo
-537     x32     recvmmsg                __x32_compat_sys_recvmmsg
+537     x32     recvmmsg                __x32_compat_sys_recvmmsg_time64
 538     x32     sendmmsg                __x32_compat_sys_sendmmsg
 539     x32     process_vm_readv        __x32_compat_sys_process_vm_readv
 540     x32     process_vm_writev       __x32_compat_sys_process_vm_writev
diff --git a/arch/x86/include/asm/unistd.h b/arch/x86/include/asm/unistd.h
index dc4ed8bc2382..146859efd83c 100644
--- a/arch/x86/include/asm/unistd.h
+++ b/arch/x86/include/asm/unistd.h
@@ -23,8 +23,8 @@
 
 #  include <asm/unistd_64.h>
 #  include <asm/unistd_64_x32.h>
-#  define __ARCH_WANT_COMPAT_SYS_TIME
-#  define __ARCH_WANT_SYS_UTIME32
+#  define __ARCH_WANT_SYS_TIME
+#  define __ARCH_WANT_SYS_UTIME
 #  define __ARCH_WANT_COMPAT_SYS_PREADV64
 #  define __ARCH_WANT_COMPAT_SYS_PWRITEV64
 #  define __ARCH_WANT_COMPAT_SYS_PREADV64V2
@@ -48,8 +48,8 @@
 # define __ARCH_WANT_SYS_SIGPENDING
 # define __ARCH_WANT_SYS_SIGPROCMASK
 # define __ARCH_WANT_SYS_SOCKETCALL
-# define __ARCH_WANT_SYS_TIME
-# define __ARCH_WANT_SYS_UTIME
+# define __ARCH_WANT_SYS_TIME32
+# define __ARCH_WANT_SYS_UTIME32
 # define __ARCH_WANT_SYS_WAITPID
 # define __ARCH_WANT_SYS_FORK
 # define __ARCH_WANT_SYS_VFORK
diff --git a/arch/xtensa/include/asm/unistd.h b/arch/xtensa/include/asm/unistd.h
index 81cc52ea1bd5..30af4dc3ce7b 100644
--- a/arch/xtensa/include/asm/unistd.h
+++ b/arch/xtensa/include/asm/unistd.h
@@ -7,7 +7,7 @@
 
 #define __ARCH_WANT_NEW_STAT
 #define __ARCH_WANT_STAT64
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_UTIME32
 #define __ARCH_WANT_SYS_GETPGRP
 
 #define NR_syscalls                             __NR_syscalls
diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl
index c699e014e0dd..6af49929de85 100644
--- a/arch/xtensa/kernel/syscalls/syscall.tbl
+++ b/arch/xtensa/kernel/syscalls/syscall.tbl
@@ -72,8 +72,8 @@
 61      common  fcntl64                         sys_fcntl64
 62      common  fallocate                       sys_fallocate
 63      common  fadvise64_64                    xtensa_fadvise64_64
-64      common  utime                           sys_utime
-65      common  utimes                          sys_utimes
+64      common  utime                           sys_utime32
+65      common  utimes                          sys_utimes_time32
 66      common  ioctl                           sys_ioctl
 67      common  fcntl                           sys_fcntl
 68      common  setxattr                        sys_setxattr
@@ -174,7 +174,7 @@
 158     common  capget                          sys_capget
 159     common  capset                          sys_capset
 160     common  ptrace                          sys_ptrace
-161     common  semtimedop                      sys_semtimedop
+161     common  semtimedop                      sys_semtimedop_time32
 162     common  semget                          sys_semget
 163     common  semop                           sys_semop
 164     common  semctl                          sys_old_semctl
@@ -206,11 +206,11 @@
 188     common  setrlimit                       sys_setrlimit
 189     common  getrlimit                       sys_getrlimit
 190     common  getrusage                       sys_getrusage
-191     common  futex                           sys_futex
+191     common  futex                           sys_futex_time32
 192     common  gettimeofday                    sys_gettimeofday
 193     common  settimeofday                    sys_settimeofday
-194     common  adjtimex                        sys_adjtimex
-195     common  nanosleep                       sys_nanosleep
+194     common  adjtimex                        sys_adjtimex_time32
+195     common  nanosleep                       sys_nanosleep_time32
 196     common  getgroups                       sys_getgroups
 197     common  setgroups                       sys_setgroups
 198     common  sethostname                     sys_sethostname
@@ -234,7 +234,7 @@
 215     common  sched_getscheduler              sys_sched_getscheduler
 216     common  sched_get_priority_max          sys_sched_get_priority_max
 217     common  sched_get_priority_min          sys_sched_get_priority_min
-218     common  sched_rr_get_interval           sys_sched_rr_get_interval
+218     common  sched_rr_get_interval           sys_sched_rr_get_interval_time32
 219     common  sched_yield                     sys_sched_yield
 222     common  available222                    sys_ni_syscall
 # Signal Handling
@@ -244,14 +244,14 @@
 226     common  rt_sigaction                    sys_rt_sigaction
 227     common  rt_sigprocmask                  sys_rt_sigprocmask
 228     common  rt_sigpending                   sys_rt_sigpending
-229     common  rt_sigtimedwait                 sys_rt_sigtimedwait
+229     common  rt_sigtimedwait                 sys_rt_sigtimedwait_time32
 230     common  rt_sigqueueinfo                 sys_rt_sigqueueinfo
 231     common  rt_sigsuspend                   sys_rt_sigsuspend
 # Message
 232     common  mq_open                         sys_mq_open
 233     common  mq_unlink                       sys_mq_unlink
-234     common  mq_timedsend                    sys_mq_timedsend
-235     common  mq_timedreceive                 sys_mq_timedreceive
+234     common  mq_timedsend                    sys_mq_timedsend_time32
+235     common  mq_timedreceive                 sys_mq_timedreceive_time32
 236     common  mq_notify                       sys_mq_notify
 237     common  mq_getsetattr                   sys_mq_getsetattr
 238     common  available238                    sys_ni_syscall
@@ -259,17 +259,17 @@
 # IO
 240     common  io_destroy                      sys_io_destroy
 241     common  io_submit                       sys_io_submit
-242     common  io_getevents                    sys_io_getevents
+242     common  io_getevents                    sys_io_getevents_time32
 243     common  io_cancel                       sys_io_cancel
-244     common  clock_settime                   sys_clock_settime
-245     common  clock_gettime                   sys_clock_gettime
-246     common  clock_getres                    sys_clock_getres
-247     common  clock_nanosleep                 sys_clock_nanosleep
+244     common  clock_settime                   sys_clock_settime32
+245     common  clock_gettime                   sys_clock_gettime32
+246     common  clock_getres                    sys_clock_getres_time32
+247     common  clock_nanosleep                 sys_clock_nanosleep_time32
 # Timer
 248     common  timer_create                    sys_timer_create
 249     common  timer_delete                    sys_timer_delete
-250     common  timer_settime                   sys_timer_settime
-251     common  timer_gettime                   sys_timer_gettime
+250     common  timer_settime                   sys_timer_settime32
+251     common  timer_gettime                   sys_timer_gettime32
 252     common  timer_getoverrun                sys_timer_getoverrun
 # System
 253     common  reserved253                     sys_ni_syscall
@@ -291,8 +291,8 @@
 269     common  tee                             sys_tee
 270     common  vmsplice                        sys_vmsplice
 271     common  available271                    sys_ni_syscall
-272     common  pselect6                        sys_pselect6
-273     common  ppoll                           sys_ppoll
+272     common  pselect6                        sys_pselect6_time32
+273     common  ppoll                           sys_ppoll_time32
 274     common  epoll_pwait                     sys_epoll_pwait
 275     common  epoll_create1                   sys_epoll_create1
 276     common  inotify_init                    sys_inotify_init
@@ -316,9 +316,9 @@
 293     common  linkat                          sys_linkat
 294     common  symlinkat                       sys_symlinkat
 295     common  readlinkat                      sys_readlinkat
-296     common  utimensat                       sys_utimensat
+296     common  utimensat                       sys_utimensat_time32
 297     common  fchownat                        sys_fchownat
-298     common  futimesat                       sys_futimesat
+298     common  futimesat                       sys_futimesat_time32
 299     common  fstatat64                       sys_fstatat64
 300     common  fchmodat                        sys_fchmodat
 301     common  faccessat                       sys_faccessat
@@ -327,14 +327,14 @@
 304     common  signalfd                        sys_signalfd
 # 305 was timerfd
 306     common  eventfd                         sys_eventfd
-307     common  recvmmsg                        sys_recvmmsg
+307     common  recvmmsg                        sys_recvmmsg_time32
 308     common  setns                           sys_setns
 309     common  signalfd4                       sys_signalfd4
 310     common  dup3                            sys_dup3
 311     common  pipe2                           sys_pipe2
 312     common  timerfd_create                  sys_timerfd_create
-313     common  timerfd_settime                 sys_timerfd_settime
-314     common  timerfd_gettime                 sys_timerfd_gettime
+313     common  timerfd_settime                 sys_timerfd_settime32
+314     common  timerfd_gettime                 sys_timerfd_gettime32
 315     common  available315                    sys_ni_syscall
 316     common  eventfd2                        sys_eventfd2
 317     common  preadv                          sys_preadv
@@ -349,7 +349,7 @@
 326     common  sync_file_range2                sys_sync_file_range2
 327     common  perf_event_open                 sys_perf_event_open
 328     common  rt_tgsigqueueinfo               sys_rt_tgsigqueueinfo
-329     common  clock_adjtime                   sys_clock_adjtime
+329     common  clock_adjtime                   sys_clock_adjtime32
 330     common  prlimit64                       sys_prlimit64
 331     common  kcmp                            sys_kcmp
 332     common  finit_module                    sys_finit_module
@@ -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/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 48f3594a7458..79bd102c9bbc 100644
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -124,7 +124,7 @@ static int ptp_clock_gettime(struct posix_clock *pc, struct timespec64 *tp)
         return err;
 }
 
-static int ptp_clock_adjtime(struct posix_clock *pc, struct timex *tx)
+static int ptp_clock_adjtime(struct posix_clock *pc, struct __kernel_timex *tx)
 {
         struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
         struct ptp_clock_info *ops;
diff --git a/fs/aio.c b/fs/aio.c
index b906ff70c90f..4394d3fe116a 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -2198,11 +2198,11 @@ SYSCALL_DEFINE6(io_pgetevents_time32,
 
 #if defined(CONFIG_COMPAT_32BIT_TIME)
 
-COMPAT_SYSCALL_DEFINE5(io_getevents, compat_aio_context_t, ctx_id,
-                       compat_long_t, min_nr,
-                       compat_long_t, nr,
-                       struct io_event __user *, events,
-                       struct old_timespec32 __user *, timeout)
+SYSCALL_DEFINE5(io_getevents_time32, __u32, ctx_id,
+                __s32, min_nr,
+                __s32, nr,
+                struct io_event __user *, events,
+                struct old_timespec32 __user *, timeout)
 {
         struct timespec64 t;
         int ret;
diff --git a/fs/select.c b/fs/select.c
index d0f35dbc0e8f..6cbc9ff56ba0 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -1379,7 +1379,7 @@ COMPAT_SYSCALL_DEFINE6(pselect6_time64, int, n, compat_ulong_t __user *, inp,
 
 #if defined(CONFIG_COMPAT_32BIT_TIME)
 
-COMPAT_SYSCALL_DEFINE6(pselect6, int, n, compat_ulong_t __user *, inp,
+COMPAT_SYSCALL_DEFINE6(pselect6_time32, int, n, compat_ulong_t __user *, inp,
         compat_ulong_t __user *, outp, compat_ulong_t __user *, exp,
         struct old_timespec32 __user *, tsp, void __user *, sig)
 {
@@ -1402,7 +1402,7 @@ COMPAT_SYSCALL_DEFINE6(pselect6, int, n, compat_ulong_t __user *, inp,
 #endif
 
 #if defined(CONFIG_COMPAT_32BIT_TIME)
-COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds,
+COMPAT_SYSCALL_DEFINE5(ppoll_time32, struct pollfd __user *, ufds,
         unsigned int,  nfds, struct old_timespec32 __user *, tsp,
         const compat_sigset_t __user *, sigmask, compat_size_t, sigsetsize)
 {
diff --git a/fs/timerfd.c b/fs/timerfd.c
index 803ca070d42e..6a6fc8aa1de7 100644
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -560,7 +560,7 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct __kernel_itimerspec __user *,
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
+SYSCALL_DEFINE4(timerfd_settime32, int, ufd, int, flags,
                 const struct old_itimerspec32 __user *, utmr,
                 struct old_itimerspec32 __user *, otmr)
 {
@@ -577,7 +577,7 @@ COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
         return ret;
 }
 
-COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd,
+SYSCALL_DEFINE2(timerfd_gettime32, int, ufd,
                 struct old_itimerspec32 __user *, otmr)
 {
         struct itimerspec64 kotmr;
diff --git a/fs/utimes.c b/fs/utimes.c
index bdcf2daf39c1..350c9c16ace1 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -224,8 +224,8 @@ SYSCALL_DEFINE2(utime, char __user *, filename, struct utimbuf __user *, times)
  * of sys_utimes.
  */
 #ifdef __ARCH_WANT_SYS_UTIME32
-COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename,
-                       struct old_utimbuf32 __user *, t)
+SYSCALL_DEFINE2(utime32, const char __user *, filename,
+                struct old_utimbuf32 __user *, t)
 {
         struct timespec64 tv[2];
 
@@ -240,7 +240,7 @@ COMPAT_SYSCALL_DEFINE2(utime, const char __user *, filename,
 }
 #endif
 
-COMPAT_SYSCALL_DEFINE4(utimensat, unsigned int, dfd, const char __user *, filename, struct old_timespec32 __user *, t, int, flags)
+SYSCALL_DEFINE4(utimensat_time32, unsigned int, dfd, const char __user *, filename, struct old_timespec32 __user *, t, int, flags)
 {
         struct timespec64 tv[2];
 
@@ -276,14 +276,14 @@ static long do_compat_futimesat(unsigned int dfd, const char __user *filename,
         return do_utimes(dfd, filename, t ? tv : NULL, 0);
 }
 
-COMPAT_SYSCALL_DEFINE3(futimesat, unsigned int, dfd,
+SYSCALL_DEFINE3(futimesat_time32, unsigned int, dfd,
                        const char __user *, filename,
                        struct old_timeval32 __user *, t)
 {
         return do_compat_futimesat(dfd, filename, t);
 }
 
-COMPAT_SYSCALL_DEFINE2(utimes, const char __user *, filename, struct old_timeval32 __user *, t)
+SYSCALL_DEFINE2(utimes_time32, const char __user *, filename, struct old_timeval32 __user *, t)
 {
         return do_compat_futimesat(AT_FDCWD, filename, t);
 }
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 056be0d03722..ebddcb6cfcf8 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -132,37 +132,6 @@ struct compat_tms {
         compat_clock_t          tms_cstime;
 };
 
-struct compat_timex {
-        compat_uint_t modes;
-        compat_long_t offset;
-        compat_long_t freq;
-        compat_long_t maxerror;
-        compat_long_t esterror;
-        compat_int_t status;
-        compat_long_t constant;
-        compat_long_t precision;
-        compat_long_t tolerance;
-        struct old_timeval32 time;
-        compat_long_t tick;
-        compat_long_t ppsfreq;
-        compat_long_t jitter;
-        compat_int_t shift;
-        compat_long_t stabil;
-        compat_long_t jitcnt;
-        compat_long_t calcnt;
-        compat_long_t errcnt;
-        compat_long_t stbcnt;
-        compat_int_t tai;
-
-        compat_int_t:32; compat_int_t:32; compat_int_t:32; compat_int_t:32;
-        compat_int_t:32; compat_int_t:32; compat_int_t:32; compat_int_t:32;
-        compat_int_t:32; compat_int_t:32; compat_int_t:32;
-};
-
-struct timex;
-int compat_get_timex(struct timex *, const struct compat_timex __user *);
-int compat_put_timex(struct compat_timex __user *, const struct timex *);
-
 #define _COMPAT_NSIG_WORDS      (_COMPAT_NSIG / _COMPAT_NSIG_BPW)
 
 typedef struct {
@@ -551,11 +520,6 @@ int __compat_save_altstack(compat_stack_t __user *, unsigned long);
 asmlinkage long compat_sys_io_setup(unsigned nr_reqs, u32 __user *ctx32p);
 asmlinkage long compat_sys_io_submit(compat_aio_context_t ctx_id, int nr,
                                      u32 __user *iocb);
-asmlinkage long compat_sys_io_getevents(compat_aio_context_t ctx_id,
-                                        compat_long_t min_nr,
-                                        compat_long_t nr,
-                                        struct io_event __user *events,
-                                        struct old_timespec32 __user *timeout);
 asmlinkage long compat_sys_io_pgetevents(compat_aio_context_t ctx_id,
                                         compat_long_t min_nr,
                                         compat_long_t nr,
@@ -648,7 +612,7 @@ asmlinkage long compat_sys_sendfile64(int out_fd, int in_fd,
                                     compat_loff_t __user *offset, compat_size_t count);
 
 /* fs/select.c */
-asmlinkage long compat_sys_pselect6(int n, compat_ulong_t __user *inp,
+asmlinkage long compat_sys_pselect6_time32(int n, compat_ulong_t __user *inp,
                                     compat_ulong_t __user *outp,
                                     compat_ulong_t __user *exp,
                                     struct old_timespec32 __user *tsp,
@@ -658,7 +622,7 @@ asmlinkage long compat_sys_pselect6_time64(int n, compat_ulong_t __user *inp,
                                     compat_ulong_t __user *exp,
                                     struct __kernel_timespec __user *tsp,
                                     void __user *sig);
-asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
+asmlinkage long compat_sys_ppoll_time32(struct pollfd __user *ufds,
                                  unsigned int nfds,
                                  struct old_timespec32 __user *tsp,
                                  const compat_sigset_t __user *sigmask,
@@ -688,19 +652,6 @@ asmlinkage long compat_sys_newfstat(unsigned int fd,
 
 /* fs/sync.c: No generic prototype for sync_file_range and sync_file_range2 */
 
-/* fs/timerfd.c */
-asmlinkage long compat_sys_timerfd_gettime(int ufd,
-                                   struct old_itimerspec32 __user *otmr);
-asmlinkage long compat_sys_timerfd_settime(int ufd, int flags,
-                                   const struct old_itimerspec32 __user *utmr,
-                                   struct old_itimerspec32 __user *otmr);
-
-/* fs/utimes.c */
-asmlinkage long compat_sys_utimensat(unsigned int dfd,
-                                     const char __user *filename,
-                                     struct old_timespec32 __user *t,
-                                     int flags);
-
 /* kernel/exit.c */
 asmlinkage long compat_sys_waitid(int, compat_pid_t,
                 struct compat_siginfo __user *, int,
@@ -709,9 +660,6 @@ asmlinkage long compat_sys_waitid(int, compat_pid_t,
 
 
 /* kernel/futex.c */
-asmlinkage long compat_sys_futex(u32 __user *uaddr, int op, u32 val,
-                struct old_timespec32 __user *utime, u32 __user *uaddr2,
-                u32 val3);
 asmlinkage long
 compat_sys_set_robust_list(struct compat_robust_list_head __user *head,
                            compat_size_t len);
@@ -719,10 +667,6 @@ asmlinkage long
 compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
                            compat_size_t __user *len_ptr);
 
-/* kernel/hrtimer.c */
-asmlinkage long compat_sys_nanosleep(struct old_timespec32 __user *rqtp,
-                                     struct old_timespec32 __user *rmtp);
-
 /* kernel/itimer.c */
 asmlinkage long compat_sys_getitimer(int which,
                                      struct compat_itimerval __user *it);
@@ -740,20 +684,6 @@ asmlinkage long compat_sys_kexec_load(compat_ulong_t entry,
 asmlinkage long compat_sys_timer_create(clockid_t which_clock,
                         struct compat_sigevent __user *timer_event_spec,
                         timer_t __user *created_timer_id);
-asmlinkage long compat_sys_timer_gettime(timer_t timer_id,
-                                 struct old_itimerspec32 __user *setting);
-asmlinkage long compat_sys_timer_settime(timer_t timer_id, int flags,
-                                         struct old_itimerspec32 __user *new,
-                                         struct old_itimerspec32 __user *old);
-asmlinkage long compat_sys_clock_settime(clockid_t which_clock,
-                                         struct old_timespec32 __user *tp);
-asmlinkage long compat_sys_clock_gettime(clockid_t which_clock,
-                                         struct old_timespec32 __user *tp);
-asmlinkage long compat_sys_clock_getres(clockid_t which_clock,
-                                        struct old_timespec32 __user *tp);
-asmlinkage long compat_sys_clock_nanosleep(clockid_t which_clock, int flags,
-                                           struct old_timespec32 __user *rqtp,
-                                           struct old_timespec32 __user *rmtp);
 
 /* kernel/ptrace.c */
 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
@@ -766,8 +696,6 @@ asmlinkage long compat_sys_sched_setaffinity(compat_pid_t pid,
 asmlinkage long compat_sys_sched_getaffinity(compat_pid_t pid,
                                      unsigned int len,
                                      compat_ulong_t __user *user_mask_ptr);
-asmlinkage long compat_sys_sched_rr_get_interval(compat_pid_t pid,
-                                                 struct old_timespec32 __user *interval);
 
 /* kernel/signal.c */
 asmlinkage long compat_sys_sigaltstack(const compat_stack_t __user *uss_ptr,
@@ -785,7 +713,7 @@ asmlinkage long compat_sys_rt_sigprocmask(int how, compat_sigset_t __user *set,
                                           compat_size_t sigsetsize);
 asmlinkage long compat_sys_rt_sigpending(compat_sigset_t __user *uset,
                                          compat_size_t sigsetsize);
-asmlinkage long compat_sys_rt_sigtimedwait(compat_sigset_t __user *uthese,
+asmlinkage long compat_sys_rt_sigtimedwait_time32(compat_sigset_t __user *uthese,
                 struct compat_siginfo __user *uinfo,
                 struct old_timespec32 __user *uts, compat_size_t sigsetsize);
 asmlinkage long compat_sys_rt_sigtimedwait_time64(compat_sigset_t __user *uthese,
@@ -808,7 +736,6 @@ asmlinkage long compat_sys_gettimeofday(struct old_timeval32 __user *tv,
                 struct timezone __user *tz);
 asmlinkage long compat_sys_settimeofday(struct old_timeval32 __user *tv,
                 struct timezone __user *tz);
-asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
 
 /* kernel/timer.c */
 asmlinkage long compat_sys_sysinfo(struct compat_sysinfo __user *info);
@@ -817,14 +744,6 @@ asmlinkage long compat_sys_sysinfo(struct compat_sysinfo __user *info);
 asmlinkage long compat_sys_mq_open(const char __user *u_name,
                         int oflag, compat_mode_t mode,
                         struct compat_mq_attr __user *u_attr);
-asmlinkage long compat_sys_mq_timedsend(mqd_t mqdes,
-                        const char __user *u_msg_ptr,
-                        compat_size_t msg_len, unsigned int msg_prio,
-                        const struct old_timespec32 __user *u_abs_timeout);
-asmlinkage ssize_t compat_sys_mq_timedreceive(mqd_t mqdes,
-                        char __user *u_msg_ptr,
-                        compat_size_t msg_len, unsigned int __user *u_msg_prio,
-                        const struct old_timespec32 __user *u_abs_timeout);
 asmlinkage long compat_sys_mq_notify(mqd_t mqdes,
                         const struct compat_sigevent __user *u_notification);
 asmlinkage long compat_sys_mq_getsetattr(mqd_t mqdes,
@@ -840,8 +759,6 @@ asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
 
 /* ipc/sem.c */
 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
-asmlinkage long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
-                unsigned nsems, const struct old_timespec32 __user *timeout);
 
 /* ipc/shm.c */
 asmlinkage long compat_sys_shmctl(int first, int second, void __user *uptr);
@@ -899,7 +816,7 @@ asmlinkage long compat_sys_rt_tgsigqueueinfo(compat_pid_t tgid,
 asmlinkage long compat_sys_recvmmsg_time64(int fd, struct compat_mmsghdr __user *mmsg,
                                     unsigned vlen, unsigned int flags,
                                     struct __kernel_timespec __user *timeout);
-asmlinkage long compat_sys_recvmmsg(int fd, struct compat_mmsghdr __user *mmsg,
+asmlinkage long compat_sys_recvmmsg_time32(int fd, struct compat_mmsghdr __user *mmsg,
                                     unsigned vlen, unsigned int flags,
                                     struct old_timespec32 __user *timeout);
 asmlinkage long compat_sys_wait4(compat_pid_t pid,
@@ -910,8 +827,6 @@ asmlinkage long compat_sys_fanotify_mark(int, unsigned int, __u32, __u32,
 asmlinkage long compat_sys_open_by_handle_at(int mountdirfd,
                                              struct file_handle __user *handle,
                                              int flags);
-asmlinkage long compat_sys_clock_adjtime(clockid_t which_clock,
-                                         struct compat_timex __user *tp);
 asmlinkage long compat_sys_sendmmsg(int fd, struct compat_mmsghdr __user *mmsg,
                                     unsigned vlen, unsigned int flags);
 asmlinkage ssize_t compat_sys_process_vm_readv(compat_pid_t pid,
@@ -952,8 +867,6 @@ asmlinkage long compat_sys_pwritev64v2(unsigned long fd,
 /* __ARCH_WANT_SYSCALL_NO_AT */
 asmlinkage long compat_sys_open(const char __user *filename, int flags,
                                 umode_t mode);
-asmlinkage long compat_sys_utimes(const char __user *filename,
-                                  struct old_timeval32 __user *t);
 
 /* __ARCH_WANT_SYSCALL_NO_FLAGS */
 asmlinkage long compat_sys_signalfd(int ufd,
@@ -967,12 +880,6 @@ asmlinkage long compat_sys_newlstat(const char __user *filename,
                                     struct compat_stat __user *statbuf);
 
 /* __ARCH_WANT_SYSCALL_DEPRECATED */
-asmlinkage long compat_sys_time(old_time32_t __user *tloc);
-asmlinkage long compat_sys_utime(const char __user *filename,
-                                 struct old_utimbuf32 __user *t);
-asmlinkage long compat_sys_futimesat(unsigned int dfd,
-                                     const char __user *filename,
-                                     struct old_timeval32 __user *t);
 asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
                 compat_ulong_t __user *outp, compat_ulong_t __user *exp,
                 struct old_timeval32 __user *tvp);
@@ -1007,9 +914,6 @@ asmlinkage long compat_sys_sigaction(int sig,
                                    struct compat_old_sigaction __user *oact);
 #endif
 
-/* obsolete: kernel/time/time.c */
-asmlinkage long compat_sys_stime(old_time32_t __user *tptr);
-
 /* obsolete: net/socket.c */
 asmlinkage long compat_sys_socketcall(int call, u32 __user *args);
 
diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h
index 3a3bc71017d5..18674d7d5b1c 100644
--- a/include/linux/posix-clock.h
+++ b/include/linux/posix-clock.h
@@ -51,7 +51,7 @@ struct posix_clock;
 struct posix_clock_operations {
         struct module *owner;
 
-        int  (*clock_adjtime)(struct posix_clock *pc, struct timex *tx);
+        int  (*clock_adjtime)(struct posix_clock *pc, struct __kernel_timex *tx);
 
         int  (*clock_gettime)(struct posix_clock *pc, struct timespec64 *ts);
 
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 938d8908b9e0..94369f5bd8e5 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -54,7 +54,7 @@ struct __sysctl_args;
 struct sysinfo;
 struct timespec;
 struct timeval;
-struct timex;
+struct __kernel_timex;
 struct timezone;
 struct tms;
 struct utimbuf;
@@ -297,6 +297,11 @@ asmlinkage long sys_io_getevents(aio_context_t ctx_id,
                                 long nr,
                                 struct io_event __user *events,
                                 struct __kernel_timespec __user *timeout);
+asmlinkage long sys_io_getevents_time32(__u32 ctx_id,
+                                __s32 min_nr,
+                                __s32 nr,
+                                struct io_event __user *events,
+                                struct old_timespec32 __user *timeout);
 asmlinkage long sys_io_pgetevents(aio_context_t ctx_id,
                                 long min_nr,
                                 long nr,
@@ -522,11 +527,19 @@ asmlinkage long sys_timerfd_settime(int ufd, int flags,
                                     const struct __kernel_itimerspec __user *utmr,
                                     struct __kernel_itimerspec __user *otmr);
 asmlinkage long sys_timerfd_gettime(int ufd, struct __kernel_itimerspec __user *otmr);
+asmlinkage long sys_timerfd_gettime32(int ufd,
+                                   struct old_itimerspec32 __user *otmr);
+asmlinkage long sys_timerfd_settime32(int ufd, int flags,
+                                   const struct old_itimerspec32 __user *utmr,
+                                   struct old_itimerspec32 __user *otmr);
 
 /* fs/utimes.c */
 asmlinkage long sys_utimensat(int dfd, const char __user *filename,
                                 struct __kernel_timespec __user *utimes,
                                 int flags);
+asmlinkage long sys_utimensat_time32(unsigned int dfd,
+                                const char __user *filename,
+                                struct old_timespec32 __user *t, int flags);
 
 /* kernel/acct.c */
 asmlinkage long sys_acct(const char __user *name);
@@ -555,6 +568,9 @@ asmlinkage long sys_unshare(unsigned long unshare_flags);
 asmlinkage long sys_futex(u32 __user *uaddr, int op, u32 val,
                         struct __kernel_timespec __user *utime, u32 __user *uaddr2,
                         u32 val3);
+asmlinkage long sys_futex_time32(u32 __user *uaddr, int op, u32 val,
+                        struct old_timespec32 __user *utime, u32 __user *uaddr2,
+                        u32 val3);
 asmlinkage long sys_get_robust_list(int pid,
                                     struct robust_list_head __user * __user *head_ptr,
                                     size_t __user *len_ptr);
@@ -564,6 +580,8 @@ asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
 /* kernel/hrtimer.c */
 asmlinkage long sys_nanosleep(struct __kernel_timespec __user *rqtp,
                               struct __kernel_timespec __user *rmtp);
+asmlinkage long sys_nanosleep_time32(struct old_timespec32 __user *rqtp,
+                                     struct old_timespec32 __user *rmtp);
 
 /* kernel/itimer.c */
 asmlinkage long sys_getitimer(int which, struct itimerval __user *value);
@@ -591,7 +609,7 @@ asmlinkage long sys_timer_gettime(timer_t timer_id,
 asmlinkage long sys_timer_getoverrun(timer_t timer_id);
 asmlinkage long sys_timer_settime(timer_t timer_id, int flags,
                                 const struct __kernel_itimerspec __user *new_setting,
-                                struct itimerspec __user *old_setting);
+                                struct __kernel_itimerspec __user *old_setting);
 asmlinkage long sys_timer_delete(timer_t timer_id);
 asmlinkage long sys_clock_settime(clockid_t which_clock,
                                 const struct __kernel_timespec __user *tp);
@@ -602,6 +620,20 @@ asmlinkage long sys_clock_getres(clockid_t which_clock,
 asmlinkage long sys_clock_nanosleep(clockid_t which_clock, int flags,
                                 const struct __kernel_timespec __user *rqtp,
                                 struct __kernel_timespec __user *rmtp);
+asmlinkage long sys_timer_gettime32(timer_t timer_id,
+                                 struct old_itimerspec32 __user *setting);
+asmlinkage long sys_timer_settime32(timer_t timer_id, int flags,
+                                         struct old_itimerspec32 __user *new,
+                                         struct old_itimerspec32 __user *old);
+asmlinkage long sys_clock_settime32(clockid_t which_clock,
+                                struct old_timespec32 __user *tp);
+asmlinkage long sys_clock_gettime32(clockid_t which_clock,
+                                struct old_timespec32 __user *tp);
+asmlinkage long sys_clock_getres_time32(clockid_t which_clock,
+                                struct old_timespec32 __user *tp);
+asmlinkage long sys_clock_nanosleep_time32(clockid_t which_clock, int flags,
+                                struct old_timespec32 __user *rqtp,
+                                struct old_timespec32 __user *rmtp);
 
 /* kernel/printk.c */
 asmlinkage long sys_syslog(int type, char __user *buf, int len);
@@ -627,6 +659,8 @@ asmlinkage long sys_sched_get_priority_max(int policy);
 asmlinkage long sys_sched_get_priority_min(int policy);
 asmlinkage long sys_sched_rr_get_interval(pid_t pid,
                                 struct __kernel_timespec __user *interval);
+asmlinkage long sys_sched_rr_get_interval_time32(pid_t pid,
+                                                 struct old_timespec32 __user *interval);
 
 /* kernel/signal.c */
 asmlinkage long sys_restart_syscall(void);
@@ -695,7 +729,8 @@ asmlinkage long sys_gettimeofday(struct timeval __user *tv,
                                 struct timezone __user *tz);
 asmlinkage long sys_settimeofday(struct timeval __user *tv,
                                 struct timezone __user *tz);
-asmlinkage long sys_adjtimex(struct timex __user *txc_p);
+asmlinkage long sys_adjtimex(struct __kernel_timex __user *txc_p);
+asmlinkage long sys_adjtimex_time32(struct old_timex32 __user *txc_p);
 
 /* kernel/timer.c */
 asmlinkage long sys_getpid(void);
@@ -714,6 +749,14 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *msg_ptr, size_t
 asmlinkage long sys_mq_timedreceive(mqd_t mqdes, char __user *msg_ptr, size_t msg_len, unsigned int __user *msg_prio, const struct __kernel_timespec __user *abs_timeout);
 asmlinkage long sys_mq_notify(mqd_t mqdes, const struct sigevent __user *notification);
 asmlinkage long sys_mq_getsetattr(mqd_t mqdes, const struct mq_attr __user *mqstat, struct mq_attr __user *omqstat);
+asmlinkage long sys_mq_timedreceive_time32(mqd_t mqdes,
+                        char __user *u_msg_ptr,
+                        unsigned int msg_len, unsigned int __user *u_msg_prio,
+                        const struct old_timespec32 __user *u_abs_timeout);
+asmlinkage long sys_mq_timedsend_time32(mqd_t mqdes,
+                        const char __user *u_msg_ptr,
+                        unsigned int msg_len, unsigned int msg_prio,
+                        const struct old_timespec32 __user *u_abs_timeout);
 
 /* ipc/msg.c */
 asmlinkage long sys_msgget(key_t key, int msgflg);
@@ -731,6 +774,9 @@ asmlinkage long sys_old_semctl(int semid, int semnum, int cmd, unsigned long arg
 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
                                 unsigned nsops,
                                 const struct __kernel_timespec __user *timeout);
+asmlinkage long sys_semtimedop_time32(int semid, struct sembuf __user *sops,
+                                unsigned nsops,
+                                const struct old_timespec32 __user *timeout);
 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
                                 unsigned nsops);
 
@@ -870,7 +916,9 @@ asmlinkage long sys_open_by_handle_at(int mountdirfd,
                                       struct file_handle __user *handle,
                                       int flags);
 asmlinkage long sys_clock_adjtime(clockid_t which_clock,
-                                struct timex __user *tx);
+                                struct __kernel_timex __user *tx);
+asmlinkage long sys_clock_adjtime32(clockid_t which_clock,
+                                struct old_timex32 __user *tx);
 asmlinkage long sys_syncfs(int fd);
 asmlinkage long sys_setns(int fd, int nstype);
 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
@@ -1006,6 +1054,7 @@ asmlinkage long sys_alarm(unsigned int seconds);
 asmlinkage long sys_getpgrp(void);
 asmlinkage long sys_pause(void);
 asmlinkage long sys_time(time_t __user *tloc);
+asmlinkage long sys_time32(old_time32_t __user *tloc);
 #ifdef __ARCH_WANT_SYS_UTIME
 asmlinkage long sys_utime(char __user *filename,
                                 struct utimbuf __user *times);
@@ -1014,6 +1063,13 @@ asmlinkage long sys_utimes(char __user *filename,
 asmlinkage long sys_futimesat(int dfd, const char __user *filename,
                               struct timeval __user *utimes);
 #endif
+asmlinkage long sys_futimesat_time32(unsigned int dfd,
+                                     const char __user *filename,
+                                     struct old_timeval32 __user *t);
+asmlinkage long sys_utime32(const char __user *filename,
+                                 struct old_utimbuf32 __user *t);
+asmlinkage long sys_utimes_time32(const char __user *filename,
+                                  struct old_timeval32 __user *t);
 asmlinkage long sys_creat(const char __user *pathname, umode_t mode);
 asmlinkage long sys_getdents(unsigned int fd,
                                 struct linux_dirent __user *dirent,
@@ -1038,6 +1094,7 @@ asmlinkage long sys_fork(void);
 
 /* obsolete: kernel/time/time.c */
 asmlinkage long sys_stime(time_t __user *tptr);
+asmlinkage long sys_stime32(old_time32_t __user *tptr);
 
 /* obsolete: kernel/signal.c */
 asmlinkage long sys_sigpending(old_sigset_t __user *uset);
diff --git a/include/linux/time32.h b/include/linux/time32.h
index 118b9977080c..0a1f302a1753 100644
--- a/include/linux/time32.h
+++ b/include/linux/time32.h
@@ -10,6 +10,7 @@
  */
 
 #include <linux/time64.h>
+#include <linux/timex.h>
 
 #define TIME_T_MAX      (time_t)((1UL << ((sizeof(time_t) << 3) - 1)) - 1)
 
@@ -35,13 +36,42 @@ struct old_utimbuf32 {
         old_time32_t    modtime;
 };
 
+struct old_timex32 {
+        u32 modes;
+        s32 offset;
+        s32 freq;
+        s32 maxerror;
+        s32 esterror;
+        s32 status;
+        s32 constant;
+        s32 precision;
+        s32 tolerance;
+        struct old_timeval32 time;
+        s32 tick;
+        s32 ppsfreq;
+        s32 jitter;
+        s32 shift;
+        s32 stabil;
+        s32 jitcnt;
+        s32 calcnt;
+        s32 errcnt;
+        s32 stbcnt;
+        s32 tai;
+
+        s32:32; s32:32; s32:32; s32:32;
+        s32:32; s32:32; s32:32; s32:32;
+        s32:32; s32:32; s32:32;
+};
+
 extern int get_old_timespec32(struct timespec64 *, const void __user *);
 extern int put_old_timespec32(const struct timespec64 *, void __user *);
 extern int get_old_itimerspec32(struct itimerspec64 *its,
                         const struct old_itimerspec32 __user *uits);
 extern int put_old_itimerspec32(const struct itimerspec64 *its,
                         struct old_itimerspec32 __user *uits);
-
+struct __kernel_timex;
+int get_old_timex32(struct __kernel_timex *, const struct old_timex32 __user *);
+int put_old_timex32(struct old_timex32 __user *, const struct __kernel_timex *);
 
 #if __BITS_PER_LONG == 64
 
diff --git a/include/linux/time64.h b/include/linux/time64.h
index 05634afba0db..f38d382ffec1 100644
--- a/include/linux/time64.h
+++ b/include/linux/time64.h
@@ -7,14 +7,6 @@
 typedef __s64 time64_t;
 typedef __u64 timeu64_t;
 
-/* CONFIG_64BIT_TIME enables new 64 bit time_t syscalls in the compat path
- * and 32-bit emulation.
- */
-#ifndef CONFIG_64BIT_TIME
-#define __kernel_timespec timespec
-#define __kernel_itimerspec itimerspec
-#endif
-
 #include <uapi/linux/time.h>
 
 struct timespec64 {
diff --git a/include/linux/timex.h b/include/linux/timex.h
index 39c25dbebfe8..ce0859763670 100644
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
@@ -151,7 +151,9 @@ extern unsigned long tick_nsec;		/* SHIFTED_HZ period (nsec) */
 #define NTP_INTERVAL_FREQ  (HZ)
 #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
 
-extern int do_adjtimex(struct timex *);
+extern int do_adjtimex(struct __kernel_timex *);
+extern int do_clock_adjtime(const clockid_t which_clock, struct __kernel_timex * ktx);
+
 extern void hardpps(const struct timespec64 *, const struct timespec64 *);
 
 int read_current_timer(unsigned long *timer_val);
diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 509484dbfd5d..acf9a07ab2ff 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -39,7 +39,7 @@ __SC_COMP(__NR_io_submit, sys_io_submit, compat_sys_io_submit)
 #define __NR_io_cancel 3
 __SYSCALL(__NR_io_cancel, sys_io_cancel)
 #define __NR_io_getevents 4
-__SC_COMP(__NR_io_getevents, sys_io_getevents, compat_sys_io_getevents)
+__SC_3264(__NR_io_getevents, sys_io_getevents_time32, sys_io_getevents)
 
 /* fs/xattr.c */
 #define __NR_setxattr 5
@@ -223,9 +223,9 @@ __SYSCALL(__NR3264_sendfile, sys_sendfile64)
 
 /* fs/select.c */
 #define __NR_pselect6 72
-__SC_COMP(__NR_pselect6, sys_pselect6, compat_sys_pselect6)
+__SC_COMP_3264(__NR_pselect6, sys_pselect6_time32, sys_pselect6, compat_sys_pselect6_time32)
 #define __NR_ppoll 73
-__SC_COMP(__NR_ppoll, sys_ppoll, compat_sys_ppoll)
+__SC_COMP_3264(__NR_ppoll, sys_ppoll_time32, sys_ppoll, compat_sys_ppoll_time32)
 
 /* fs/signalfd.c */
 #define __NR_signalfd4 74
@@ -270,15 +270,15 @@ __SC_COMP(__NR_sync_file_range, sys_sync_file_range, \
 #define __NR_timerfd_create 85
 __SYSCALL(__NR_timerfd_create, sys_timerfd_create)
 #define __NR_timerfd_settime 86
-__SC_COMP(__NR_timerfd_settime, sys_timerfd_settime, \
-          compat_sys_timerfd_settime)
+__SC_3264(__NR_timerfd_settime, sys_timerfd_settime32, \
+          sys_timerfd_settime)
 #define __NR_timerfd_gettime 87
-__SC_COMP(__NR_timerfd_gettime, sys_timerfd_gettime, \
-          compat_sys_timerfd_gettime)
+__SC_3264(__NR_timerfd_gettime, sys_timerfd_gettime32, \
+          sys_timerfd_gettime)
 
 /* fs/utimes.c */
 #define __NR_utimensat 88
-__SC_COMP(__NR_utimensat, sys_utimensat, compat_sys_utimensat)
+__SC_3264(__NR_utimensat, sys_utimensat_time32, sys_utimensat)
 
 /* kernel/acct.c */
 #define __NR_acct 89
@@ -310,7 +310,7 @@ __SYSCALL(__NR_unshare, sys_unshare)
 
 /* kernel/futex.c */
 #define __NR_futex 98
-__SC_COMP(__NR_futex, sys_futex, compat_sys_futex)
+__SC_3264(__NR_futex, sys_futex_time32, sys_futex)
 #define __NR_set_robust_list 99
 __SC_COMP(__NR_set_robust_list, sys_set_robust_list, \
           compat_sys_set_robust_list)
@@ -320,7 +320,7 @@ __SC_COMP(__NR_get_robust_list, sys_get_robust_list, \
 
 /* kernel/hrtimer.c */
 #define __NR_nanosleep 101
-__SC_COMP(__NR_nanosleep, sys_nanosleep, compat_sys_nanosleep)
+__SC_3264(__NR_nanosleep, sys_nanosleep_time32, sys_nanosleep)
 
 /* kernel/itimer.c */
 #define __NR_getitimer 102
@@ -342,22 +342,22 @@ __SYSCALL(__NR_delete_module, sys_delete_module)
 #define __NR_timer_create 107
 __SC_COMP(__NR_timer_create, sys_timer_create, compat_sys_timer_create)
 #define __NR_timer_gettime 108
-__SC_COMP(__NR_timer_gettime, sys_timer_gettime, compat_sys_timer_gettime)
+__SC_3264(__NR_timer_gettime, sys_timer_gettime32, sys_timer_gettime)
 #define __NR_timer_getoverrun 109
 __SYSCALL(__NR_timer_getoverrun, sys_timer_getoverrun)
 #define __NR_timer_settime 110
-__SC_COMP(__NR_timer_settime, sys_timer_settime, compat_sys_timer_settime)
+__SC_3264(__NR_timer_settime, sys_timer_settime32, sys_timer_settime)
 #define __NR_timer_delete 111
 __SYSCALL(__NR_timer_delete, sys_timer_delete)
 #define __NR_clock_settime 112
-__SC_COMP(__NR_clock_settime, sys_clock_settime, compat_sys_clock_settime)
+__SC_3264(__NR_clock_settime, sys_clock_settime32, sys_clock_settime)
 #define __NR_clock_gettime 113
-__SC_COMP(__NR_clock_gettime, sys_clock_gettime, compat_sys_clock_gettime)
+__SC_3264(__NR_clock_gettime, sys_clock_gettime32, sys_clock_gettime)
 #define __NR_clock_getres 114
-__SC_COMP(__NR_clock_getres, sys_clock_getres, compat_sys_clock_getres)
+__SC_3264(__NR_clock_getres, sys_clock_getres_time32, sys_clock_getres)
 #define __NR_clock_nanosleep 115
-__SC_COMP(__NR_clock_nanosleep, sys_clock_nanosleep, \
-          compat_sys_clock_nanosleep)
+__SC_3264(__NR_clock_nanosleep, sys_clock_nanosleep_time32, \
+          sys_clock_nanosleep)
 
 /* kernel/printk.c */
 #define __NR_syslog 116
@@ -389,8 +389,8 @@ __SYSCALL(__NR_sched_get_priority_max, sys_sched_get_priority_max)
 #define __NR_sched_get_priority_min 126
 __SYSCALL(__NR_sched_get_priority_min, sys_sched_get_priority_min)
 #define __NR_sched_rr_get_interval 127
-__SC_COMP(__NR_sched_rr_get_interval, sys_sched_rr_get_interval, \
-          compat_sys_sched_rr_get_interval)
+__SC_3264(__NR_sched_rr_get_interval, sys_sched_rr_get_interval_time32, \
+          sys_sched_rr_get_interval)
 
 /* kernel/signal.c */
 #define __NR_restart_syscall 128
@@ -412,8 +412,8 @@ __SC_COMP(__NR_rt_sigprocmask, sys_rt_sigprocmask, compat_sys_rt_sigprocmask)
 #define __NR_rt_sigpending 136
 __SC_COMP(__NR_rt_sigpending, sys_rt_sigpending, compat_sys_rt_sigpending)
 #define __NR_rt_sigtimedwait 137
-__SC_COMP(__NR_rt_sigtimedwait, sys_rt_sigtimedwait, \
-          compat_sys_rt_sigtimedwait)
+__SC_COMP_3264(__NR_rt_sigtimedwait, sys_rt_sigtimedwait_time32, \
+          sys_rt_sigtimedwait, compat_sys_rt_sigtimedwait_time32)
 #define __NR_rt_sigqueueinfo 138
 __SC_COMP(__NR_rt_sigqueueinfo, sys_rt_sigqueueinfo, \
           compat_sys_rt_sigqueueinfo)
@@ -486,7 +486,7 @@ __SC_COMP(__NR_gettimeofday, sys_gettimeofday, compat_sys_gettimeofday)
 #define __NR_settimeofday 170
 __SC_COMP(__NR_settimeofday, sys_settimeofday, compat_sys_settimeofday)
 #define __NR_adjtimex 171
-__SC_COMP(__NR_adjtimex, sys_adjtimex, compat_sys_adjtimex)
+__SC_3264(__NR_adjtimex, sys_adjtimex_time32, sys_adjtimex)
 
 /* kernel/timer.c */
 #define __NR_getpid 172
@@ -512,10 +512,10 @@ __SC_COMP(__NR_mq_open, sys_mq_open, compat_sys_mq_open)
 #define __NR_mq_unlink 181
 __SYSCALL(__NR_mq_unlink, sys_mq_unlink)
 #define __NR_mq_timedsend 182
-__SC_COMP(__NR_mq_timedsend, sys_mq_timedsend, compat_sys_mq_timedsend)
+__SC_3264(__NR_mq_timedsend, sys_mq_timedsend_time32, sys_mq_timedsend)
 #define __NR_mq_timedreceive 183
-__SC_COMP(__NR_mq_timedreceive, sys_mq_timedreceive, \
-          compat_sys_mq_timedreceive)
+__SC_3264(__NR_mq_timedreceive, sys_mq_timedreceive_time32, \
+          sys_mq_timedreceive)
 #define __NR_mq_notify 184
 __SC_COMP(__NR_mq_notify, sys_mq_notify, compat_sys_mq_notify)
 #define __NR_mq_getsetattr 185
@@ -537,7 +537,7 @@ __SYSCALL(__NR_semget, sys_semget)
 #define __NR_semctl 191
 __SC_COMP(__NR_semctl, sys_semctl, compat_sys_semctl)
 #define __NR_semtimedop 192
-__SC_COMP(__NR_semtimedop, sys_semtimedop, compat_sys_semtimedop)
+__SC_COMP(__NR_semtimedop, sys_semtimedop, sys_semtimedop_time32)
 #define __NR_semop 193
 __SYSCALL(__NR_semop, sys_semop)
 
@@ -659,7 +659,7 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 #define __NR_accept4 242
 __SYSCALL(__NR_accept4, sys_accept4)
 #define __NR_recvmmsg 243
-__SC_COMP(__NR_recvmmsg, sys_recvmmsg, compat_sys_recvmmsg)
+__SC_COMP_3264(__NR_recvmmsg, sys_recvmmsg_time32, sys_recvmmsg, compat_sys_recvmmsg_time32)
 
 /*
  * Architectures may provide up to 16 syscalls of their own
@@ -681,7 +681,7 @@ __SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at)
 __SC_COMP(__NR_open_by_handle_at, sys_open_by_handle_at, \
           compat_sys_open_by_handle_at)
 #define __NR_clock_adjtime 266
-__SC_COMP(__NR_clock_adjtime, sys_clock_adjtime, compat_sys_clock_adjtime)
+__SC_3264(__NR_clock_adjtime, sys_clock_adjtime32, sys_clock_adjtime)
 #define __NR_syncfs 267
 __SYSCALL(__NR_syncfs, sys_syncfs)
 #define __NR_setns 268
@@ -735,15 +735,57 @@ __SYSCALL(__NR_pkey_free,     sys_pkey_free)
 #define __NR_statx 291
 __SYSCALL(__NR_statx,     sys_statx)
 #define __NR_io_pgetevents 292
-__SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)
+__SC_COMP_3264(__NR_io_pgetevents, sys_io_pgetevents_time32, sys_io_pgetevents, compat_sys_io_pgetevents)
 #define __NR_rseq 293
 __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/include/uapi/linux/time.h b/include/uapi/linux/time.h
index 6b56a2208be7..b03f8717c312 100644
--- a/include/uapi/linux/time.h
+++ b/include/uapi/linux/time.h
@@ -42,19 +42,15 @@ struct itimerval {
         struct timeval it_value;        /* current value */
 };
 
-#ifndef __kernel_timespec
 struct __kernel_timespec {
         __kernel_time64_t       tv_sec;                 /* seconds */
         long long               tv_nsec;                /* nanoseconds */
 };
-#endif
 
-#ifndef __kernel_itimerspec
 struct __kernel_itimerspec {
         struct __kernel_timespec it_interval;    /* timer period */
         struct __kernel_timespec it_value;       /* timer expiration */
 };
-#endif
 
 /*
  * legacy timeval structure, only embedded in structures that
diff --git a/include/uapi/linux/timex.h b/include/uapi/linux/timex.h
index 92685d826444..9f517f9010bb 100644
--- a/include/uapi/linux/timex.h
+++ b/include/uapi/linux/timex.h
@@ -92,6 +92,45 @@ struct timex {
         int  :32; int  :32; int  :32;
 };
 
+struct __kernel_timex_timeval {
+        __kernel_time64_t       tv_sec;
+        long long               tv_usec;
+};
+
+struct __kernel_timex {
+        unsigned int modes;     /* mode selector */
+        int :32;            /* pad */
+        long long offset;       /* time offset (usec) */
+        long long freq; /* frequency offset (scaled ppm) */
+        long long maxerror;/* maximum error (usec) */
+        long long esterror;/* estimated error (usec) */
+        int status;             /* clock command/status */
+        int :32;            /* pad */
+        long long constant;/* pll time constant */
+        long long precision;/* clock precision (usec) (read only) */
+        long long tolerance;/* clock frequency tolerance (ppm)
+                                   * (read only)
+                                   */
+        struct __kernel_timex_timeval time;     /* (read only, except for ADJ_SETOFFSET) */
+        long long tick; /* (modified) usecs between clock ticks */
+
+        long long ppsfreq;/* pps frequency (scaled ppm) (ro) */
+        long long jitter; /* pps jitter (us) (ro) */
+        int shift;              /* interval duration (s) (shift) (ro) */
+        int :32;            /* pad */
+        long long stabil;            /* pps stability (scaled ppm) (ro) */
+        long long jitcnt; /* jitter limit exceeded (ro) */
+        long long calcnt; /* calibration intervals (ro) */
+        long long errcnt; /* calibration errors (ro) */
+        long long stbcnt; /* stability limit exceeded (ro) */
+
+        int tai;                /* TAI offset (ro) */
+
+        int  :32; int  :32; int  :32; int  :32;
+        int  :32; int  :32; int  :32; int  :32;
+        int  :32; int  :32; int  :32;
+};
+
 /*
  * Mode codes (timex.mode)
  */
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index c595bed7bfcb..c839bf83231d 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1471,10 +1471,10 @@ static int compat_prepare_timeout(const struct old_timespec32 __user *p,
         return 0;
 }
 
-COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,
-                       const char __user *, u_msg_ptr,
-                       compat_size_t, msg_len, unsigned int, msg_prio,
-                       const struct old_timespec32 __user *, u_abs_timeout)
+SYSCALL_DEFINE5(mq_timedsend_time32, mqd_t, mqdes,
+                const char __user *, u_msg_ptr,
+                unsigned int, msg_len, unsigned int, msg_prio,
+                const struct old_timespec32 __user *, u_abs_timeout)
 {
         struct timespec64 ts, *p = NULL;
         if (u_abs_timeout) {
@@ -1486,10 +1486,10 @@ COMPAT_SYSCALL_DEFINE5(mq_timedsend, mqd_t, mqdes,
         return do_mq_timedsend(mqdes, u_msg_ptr, msg_len, msg_prio, p);
 }
 
-COMPAT_SYSCALL_DEFINE5(mq_timedreceive, mqd_t, mqdes,
-                       char __user *, u_msg_ptr,
-                       compat_size_t, msg_len, unsigned int __user *, u_msg_prio,
-                       const struct old_timespec32 __user *, u_abs_timeout)
+SYSCALL_DEFINE5(mq_timedreceive_time32, mqd_t, mqdes,
+                char __user *, u_msg_ptr,
+                unsigned int, msg_len, unsigned int __user *, u_msg_prio,
+                const struct old_timespec32 __user *, u_abs_timeout)
 {
         struct timespec64 ts, *p = NULL;
         if (u_abs_timeout) {
diff --git a/ipc/sem.c b/ipc/sem.c
index d1efff3a81bb..80909464acff 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -2250,7 +2250,7 @@ long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
         return do_semtimedop(semid, tsems, nsops, NULL);
 }
 
-COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
+SYSCALL_DEFINE4(semtimedop_time32, int, semid, struct sembuf __user *, tsems,
                        unsigned int, nsops,
                        const struct old_timespec32 __user *, timeout)
 {
diff --git a/kernel/compat.c b/kernel/compat.c
index f01affa17e22..d8a36c6ad7c9 100644
--- a/kernel/compat.c
+++ b/kernel/compat.c
@@ -20,7 +20,6 @@
 #include <linux/syscalls.h>
 #include <linux/unistd.h>
 #include <linux/security.h>
-#include <linux/timex.h>
 #include <linux/export.h>
 #include <linux/migrate.h>
 #include <linux/posix-timers.h>
@@ -30,69 +29,6 @@
 
 #include <linux/uaccess.h>
 
-int compat_get_timex(struct timex *txc, const struct compat_timex __user *utp)
-{
-        struct compat_timex tx32;
-
-        memset(txc, 0, sizeof(struct timex));
-        if (copy_from_user(&tx32, utp, sizeof(struct compat_timex)))
-                return -EFAULT;
-
-        txc->modes = tx32.modes;
-        txc->offset = tx32.offset;
-        txc->freq = tx32.freq;
-        txc->maxerror = tx32.maxerror;
-        txc->esterror = tx32.esterror;
-        txc->status = tx32.status;
-        txc->constant = tx32.constant;
-        txc->precision = tx32.precision;
-        txc->tolerance = tx32.tolerance;
-        txc->time.tv_sec = tx32.time.tv_sec;
-        txc->time.tv_usec = tx32.time.tv_usec;
-        txc->tick = tx32.tick;
-        txc->ppsfreq = tx32.ppsfreq;
-        txc->jitter = tx32.jitter;
-        txc->shift = tx32.shift;
-        txc->stabil = tx32.stabil;
-        txc->jitcnt = tx32.jitcnt;
-        txc->calcnt = tx32.calcnt;
-        txc->errcnt = tx32.errcnt;
-        txc->stbcnt = tx32.stbcnt;
-
-        return 0;
-}
-
-int compat_put_timex(struct compat_timex __user *utp, const struct timex *txc)
-{
-        struct compat_timex tx32;
-
-        memset(&tx32, 0, sizeof(struct compat_timex));
-        tx32.modes = txc->modes;
-        tx32.offset = txc->offset;
-        tx32.freq = txc->freq;
-        tx32.maxerror = txc->maxerror;
-        tx32.esterror = txc->esterror;
-        tx32.status = txc->status;
-        tx32.constant = txc->constant;
-        tx32.precision = txc->precision;
-        tx32.tolerance = txc->tolerance;
-        tx32.time.tv_sec = txc->time.tv_sec;
-        tx32.time.tv_usec = txc->time.tv_usec;
-        tx32.tick = txc->tick;
-        tx32.ppsfreq = txc->ppsfreq;
-        tx32.jitter = txc->jitter;
-        tx32.shift = txc->shift;
-        tx32.stabil = txc->stabil;
-        tx32.jitcnt = txc->jitcnt;
-        tx32.calcnt = txc->calcnt;
-        tx32.errcnt = txc->errcnt;
-        tx32.stbcnt = txc->stbcnt;
-        tx32.tai = txc->tai;
-        if (copy_to_user(utp, &tx32, sizeof(struct compat_timex)))
-                return -EFAULT;
-        return 0;
-}
-
 static int __compat_get_timeval(struct timeval *tv, const struct old_timeval32 __user *ctv)
 {
         return (!access_ok(ctv, sizeof(*ctv)) ||
diff --git a/kernel/futex.c b/kernel/futex.c
index fdd312da0992..26fb8a0909ad 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -3815,7 +3815,7 @@ err_unlock:
 #endif /* CONFIG_COMPAT */
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE6(futex, u32 __user *, uaddr, int, op, u32, val,
+SYSCALL_DEFINE6(futex_time32, u32 __user *, uaddr, int, op, u32, val,
                 struct old_timespec32 __user *, utime, u32 __user *, uaddr2,
                 u32, val3)
 {
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index d8d76a65cfdd..c09d0bd9377a 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5265,9 +5265,8 @@ SYSCALL_DEFINE2(sched_rr_get_interval, pid_t, pid,
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
-                       compat_pid_t, pid,
-                       struct old_timespec32 __user *, interval)
+SYSCALL_DEFINE2(sched_rr_get_interval_time32, pid_t, pid,
+                struct old_timespec32 __user *, interval)
 {
         struct timespec64 t;
         int retval = sched_rr_get_interval(pid, &t);
diff --git a/kernel/signal.c b/kernel/signal.c
index e1d7ad8e6ab1..af27629918cf 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3397,7 +3397,7 @@ COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait_time64, compat_sigset_t __user *, uthese,
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait, compat_sigset_t __user *, uthese,
+COMPAT_SYSCALL_DEFINE4(rt_sigtimedwait_time32, compat_sigset_t __user *, uthese,
                 struct compat_siginfo __user *, uinfo,
                 struct old_timespec32 __user *, uts, compat_size_t, sigsetsize)
 {
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index ce04431a40d1..85e5ccec0955 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -42,9 +42,11 @@ COND_SYSCALL(io_destroy);
 COND_SYSCALL(io_submit);
 COND_SYSCALL_COMPAT(io_submit);
 COND_SYSCALL(io_cancel);
+COND_SYSCALL(io_getevents_time32);
 COND_SYSCALL(io_getevents);
+COND_SYSCALL(io_pgetevents_time32);
 COND_SYSCALL(io_pgetevents);
-COND_SYSCALL_COMPAT(io_getevents);
+COND_SYSCALL_COMPAT(io_pgetevents_time32);
 COND_SYSCALL_COMPAT(io_pgetevents);
 
 /* fs/xattr.c */
@@ -114,9 +116,9 @@ COND_SYSCALL_COMPAT(signalfd4);
 /* fs/timerfd.c */
 COND_SYSCALL(timerfd_create);
 COND_SYSCALL(timerfd_settime);
-COND_SYSCALL_COMPAT(timerfd_settime);
+COND_SYSCALL(timerfd_settime32);
 COND_SYSCALL(timerfd_gettime);
-COND_SYSCALL_COMPAT(timerfd_gettime);
+COND_SYSCALL(timerfd_gettime32);
 
 /* fs/utimes.c */
 
@@ -135,7 +137,7 @@ COND_SYSCALL(capset);
 
 /* kernel/futex.c */
 COND_SYSCALL(futex);
-COND_SYSCALL_COMPAT(futex);
+COND_SYSCALL(futex_time32);
 COND_SYSCALL(set_robust_list);
 COND_SYSCALL_COMPAT(set_robust_list);
 COND_SYSCALL(get_robust_list);
@@ -187,9 +189,9 @@ COND_SYSCALL(mq_open);
 COND_SYSCALL_COMPAT(mq_open);
 COND_SYSCALL(mq_unlink);
 COND_SYSCALL(mq_timedsend);
-COND_SYSCALL_COMPAT(mq_timedsend);
+COND_SYSCALL(mq_timedsend_time32);
 COND_SYSCALL(mq_timedreceive);
-COND_SYSCALL_COMPAT(mq_timedreceive);
+COND_SYSCALL(mq_timedreceive_time32);
 COND_SYSCALL(mq_notify);
 COND_SYSCALL_COMPAT(mq_notify);
 COND_SYSCALL(mq_getsetattr);
@@ -211,7 +213,7 @@ COND_SYSCALL(old_semctl);
 COND_SYSCALL(semctl);
 COND_SYSCALL_COMPAT(semctl);
 COND_SYSCALL(semtimedop);
-COND_SYSCALL_COMPAT(semtimedop);
+COND_SYSCALL(semtimedop_time32);
 COND_SYSCALL(semop);
 
 /* ipc/shm.c */
@@ -288,7 +290,7 @@ COND_SYSCALL(perf_event_open);
 COND_SYSCALL(accept4);
 COND_SYSCALL(recvmmsg);
 COND_SYSCALL(recvmmsg_time32);
-COND_SYSCALL_COMPAT(recvmmsg);
+COND_SYSCALL_COMPAT(recvmmsg_time32);
 COND_SYSCALL_COMPAT(recvmmsg_time64);
 
 /*
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index f5cfa1b73d6f..0f5f96075110 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1771,7 +1771,7 @@ SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
-COMPAT_SYSCALL_DEFINE2(nanosleep, struct old_timespec32 __user *, rqtp,
+SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp,
                        struct old_timespec32 __user *, rmtp)
 {
         struct timespec64 tu;
diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 36a2bef00125..92a90014a925 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -188,13 +188,13 @@ static inline int is_error_status(int status)
                         && (status & (STA_PPSWANDER|STA_PPSERROR)));
 }
 
-static inline void pps_fill_timex(struct timex *txc)
+static inline void pps_fill_timex(struct __kernel_timex *txc)
 {
         txc->ppsfreq       = shift_right((pps_freq >> PPM_SCALE_INV_SHIFT) *
                                          PPM_SCALE_INV, NTP_SCALE_SHIFT);
         txc->jitter        = pps_jitter;
         if (!(time_status & STA_NANO))
-                txc->jitter /= NSEC_PER_USEC;
+                txc->jitter = pps_jitter / NSEC_PER_USEC;
         txc->shift         = pps_shift;
         txc->stabil        = pps_stabil;
         txc->jitcnt        = pps_jitcnt;
@@ -220,7 +220,7 @@ static inline int is_error_status(int status)
         return status & (STA_UNSYNC|STA_CLOCKERR);
 }
 
-static inline void pps_fill_timex(struct timex *txc)
+static inline void pps_fill_timex(struct __kernel_timex *txc)
 {
         /* PPS is not implemented, so these are zero */
         txc->ppsfreq       = 0;
@@ -633,7 +633,7 @@ void ntp_notify_cmos_timer(void)
 /*
  * Propagate a new txc->status value into the NTP state:
  */
-static inline void process_adj_status(const struct timex *txc)
+static inline void process_adj_status(const struct __kernel_timex *txc)
 {
         if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) {
                 time_state = TIME_OK;
@@ -656,7 +656,8 @@ static inline void process_adj_status(const struct timex *txc)
 }
 
 
-static inline void process_adjtimex_modes(const struct timex *txc, s32 *time_tai)
+static inline void process_adjtimex_modes(const struct __kernel_timex *txc,
+                                          s32 *time_tai)
 {
         if (txc->modes & ADJ_STATUS)
                 process_adj_status(txc);
@@ -707,7 +708,8 @@ static inline void process_adjtimex_modes(const struct timex *txc, s32 *time_tai
  * adjtimex mainly allows reading (and writing, if superuser) of
  * kernel time-keeping variables. used by xntpd.
  */
-int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai)
+int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts,
+                  s32 *time_tai)
 {
         int result;
 
@@ -729,7 +731,7 @@ int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai)
                 txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,
                                   NTP_SCALE_SHIFT);
                 if (!(time_status & STA_NANO))
-                        txc->offset /= NSEC_PER_USEC;
+                        txc->offset = (u32)txc->offset / NSEC_PER_USEC;
         }
 
         result = time_state;    /* mostly `TIME_OK' */
@@ -754,7 +756,7 @@ int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai)
         txc->time.tv_sec = (time_t)ts->tv_sec;
         txc->time.tv_usec = ts->tv_nsec;
         if (!(time_status & STA_NANO))
-                txc->time.tv_usec /= NSEC_PER_USEC;
+                txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;
 
         /* Handle leapsec adjustments */
         if (unlikely(ts->tv_sec >= ntp_next_leap_sec)) {
diff --git a/kernel/time/ntp_internal.h b/kernel/time/ntp_internal.h
index c24b0e13f011..40e6122e634e 100644
--- a/kernel/time/ntp_internal.h
+++ b/kernel/time/ntp_internal.h
@@ -8,6 +8,6 @@ extern void ntp_clear(void);
 extern u64 ntp_tick_length(void);
 extern ktime_t ntp_get_next_leap(void);
 extern int second_overflow(time64_t secs);
-extern int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai);
+extern int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts, s32 *time_tai);
 extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts);
 #endif /* _LINUX_NTP_INTERNAL_H */
diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index 425bbfce6819..ec960bb939fd 100644
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -228,7 +228,7 @@ static void put_clock_desc(struct posix_clock_desc *cd)
         fput(cd->fp);
 }
 
-static int pc_clock_adjtime(clockid_t id, struct timex *tx)
+static int pc_clock_adjtime(clockid_t id, struct __kernel_timex *tx)
 {
         struct posix_clock_desc cd;
         int err;
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index a51895486e5e..67df65f887ac 100644
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -45,6 +45,7 @@ SYS_NI(timer_delete);
 SYS_NI(clock_adjtime);
 SYS_NI(getitimer);
 SYS_NI(setitimer);
+SYS_NI(clock_adjtime32);
 #ifdef __ARCH_WANT_SYS_ALARM
 SYS_NI(alarm);
 #endif
@@ -150,16 +151,16 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 
 #ifdef CONFIG_COMPAT
 COMPAT_SYS_NI(timer_create);
-COMPAT_SYS_NI(clock_adjtime);
-COMPAT_SYS_NI(timer_settime);
-COMPAT_SYS_NI(timer_gettime);
 COMPAT_SYS_NI(getitimer);
 COMPAT_SYS_NI(setitimer);
 #endif
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
-                       struct old_timespec32 __user *, tp)
+SYS_NI(timer_settime32);
+SYS_NI(timer_gettime32);
+
+SYSCALL_DEFINE2(clock_settime32, const clockid_t, which_clock,
+                struct old_timespec32 __user *, tp)
 {
         struct timespec64 new_tp;
 
@@ -171,8 +172,8 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
         return do_sys_settimeofday64(&new_tp, NULL);
 }
 
-COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
-                       struct old_timespec32 __user *, tp)
+SYSCALL_DEFINE2(clock_gettime32, clockid_t, which_clock,
+                struct old_timespec32 __user *, tp)
 {
         int ret;
         struct timespec64 kernel_tp;
@@ -186,8 +187,8 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
         return 0;
 }
 
-COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
-                       struct old_timespec32 __user *, tp)
+SYSCALL_DEFINE2(clock_getres_time32, clockid_t, which_clock,
+                struct old_timespec32 __user *, tp)
 {
         struct timespec64 rtn_tp = {
                 .tv_sec = 0,
@@ -206,9 +207,9 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
         }
 }
 
-COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
-                       struct old_timespec32 __user *, rqtp,
-                       struct old_timespec32 __user *, rmtp)
+SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,
+                struct old_timespec32 __user *, rqtp,
+                struct old_timespec32 __user *, rmtp)
 {
         struct timespec64 t;
 
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 0e84bb72a3da..29176635991f 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -179,7 +179,7 @@ static int posix_clock_realtime_set(const clockid_t which_clock,
 }
 
 static int posix_clock_realtime_adj(const clockid_t which_clock,
-                                    struct timex *t)
+                                    struct __kernel_timex *t)
 {
         return do_adjtimex(t);
 }
@@ -730,8 +730,8 @@ SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
-COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
-                       struct old_itimerspec32 __user *, setting)
+SYSCALL_DEFINE2(timer_gettime32, timer_t, timer_id,
+                struct old_itimerspec32 __user *, setting)
 {
         struct itimerspec64 cur_setting;
 
@@ -903,9 +903,9 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
-                       struct old_itimerspec32 __user *, new,
-                       struct old_itimerspec32 __user *, old)
+SYSCALL_DEFINE4(timer_settime32, timer_t, timer_id, int, flags,
+                struct old_itimerspec32 __user *, new,
+                struct old_itimerspec32 __user *, old)
 {
         struct itimerspec64 new_spec, old_spec;
         struct itimerspec64 *rtn = old ? &old_spec : NULL;
@@ -1047,22 +1047,28 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
         return error;
 }
 
-SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
-                struct timex __user *, utx)
+int do_clock_adjtime(const clockid_t which_clock, struct __kernel_timex * ktx)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
-        struct timex ktx;
-        int err;
 
         if (!kc)
                 return -EINVAL;
         if (!kc->clock_adj)
                 return -EOPNOTSUPP;
 
+        return kc->clock_adj(which_clock, ktx);
+}
+
+SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
+                struct __kernel_timex __user *, utx)
+{
+        struct __kernel_timex ktx;
+        int err;
+
         if (copy_from_user(&ktx, utx, sizeof(ktx)))
                 return -EFAULT;
 
-        err = kc->clock_adj(which_clock, &ktx);
+        err = do_clock_adjtime(which_clock, &ktx);
 
         if (err >= 0 && copy_to_user(utx, &ktx, sizeof(ktx)))
                 return -EFAULT;
@@ -1090,8 +1096,8 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
-COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
-                       struct old_timespec32 __user *, tp)
+SYSCALL_DEFINE2(clock_settime32, clockid_t, which_clock,
+                struct old_timespec32 __user *, tp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 ts;
@@ -1105,8 +1111,8 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
         return kc->clock_set(which_clock, &ts);
 }
 
-COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
-                       struct old_timespec32 __user *, tp)
+SYSCALL_DEFINE2(clock_gettime32, clockid_t, which_clock,
+                struct old_timespec32 __user *, tp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 ts;
@@ -1123,40 +1129,26 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
         return err;
 }
 
-#endif
-
-#ifdef CONFIG_COMPAT
-
-COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
-                       struct compat_timex __user *, utp)
+SYSCALL_DEFINE2(clock_adjtime32, clockid_t, which_clock,
+                struct old_timex32 __user *, utp)
 {
-        const struct k_clock *kc = clockid_to_kclock(which_clock);
-        struct timex ktx;
+        struct __kernel_timex ktx;
         int err;
 
-        if (!kc)
-                return -EINVAL;
-        if (!kc->clock_adj)
-                return -EOPNOTSUPP;
-
-        err = compat_get_timex(&ktx, utp);
+        err = get_old_timex32(&ktx, utp);
         if (err)
                 return err;
 
-        err = kc->clock_adj(which_clock, &ktx);
+        err = do_clock_adjtime(which_clock, &ktx);
 
         if (err >= 0)
-                err = compat_put_timex(utp, &ktx);
+                err = put_old_timex32(utp, &ktx);
 
         return err;
 }
 
-#endif
-
-#ifdef CONFIG_COMPAT_32BIT_TIME
-
-COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
-                       struct old_timespec32 __user *, tp)
+SYSCALL_DEFINE2(clock_getres_time32, clockid_t, which_clock,
+                struct old_timespec32 __user *, tp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 ts;
@@ -1212,9 +1204,9 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
-COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
-                       struct old_timespec32 __user *, rqtp,
-                       struct old_timespec32 __user *, rmtp)
+SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags,
+                struct old_timespec32 __user *, rqtp,
+                struct old_timespec32 __user *, rmtp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 t;
diff --git a/kernel/time/posix-timers.h b/kernel/time/posix-timers.h
index ddb21145211a..de5daa6d975a 100644
--- a/kernel/time/posix-timers.h
+++ b/kernel/time/posix-timers.h
@@ -8,7 +8,7 @@ struct k_clock {
                              const struct timespec64 *tp);
         int     (*clock_get)(const clockid_t which_clock,
                              struct timespec64 *tp);
-        int     (*clock_adj)(const clockid_t which_clock, struct timex *tx);
+        int     (*clock_adj)(const clockid_t which_clock, struct __kernel_timex *tx);
         int     (*timer_create)(struct k_itimer *timer);
         int     (*nsleep)(const clockid_t which_clock, int flags,
                           const struct timespec64 *);
diff --git a/kernel/time/time.c b/kernel/time/time.c
index 2edb5088a70b..c3f756f8534b 100644
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@ -98,11 +98,11 @@ SYSCALL_DEFINE1(stime, time_t __user *, tptr)
 
 #endif /* __ARCH_WANT_SYS_TIME */
 
-#ifdef CONFIG_COMPAT
-#ifdef __ARCH_WANT_COMPAT_SYS_TIME
+#ifdef CONFIG_COMPAT_32BIT_TIME
+#ifdef __ARCH_WANT_SYS_TIME32
 
 /* old_time32_t is a 32 bit "long" and needs to get converted. */
-COMPAT_SYSCALL_DEFINE1(time, old_time32_t __user *, tloc)
+SYSCALL_DEFINE1(time32, old_time32_t __user *, tloc)
 {
         old_time32_t i;
 
@@ -116,7 +116,7 @@ COMPAT_SYSCALL_DEFINE1(time, old_time32_t __user *, tloc)
         return i;
 }
 
-COMPAT_SYSCALL_DEFINE1(stime, old_time32_t __user *, tptr)
+SYSCALL_DEFINE1(stime32, old_time32_t __user *, tptr)
 {
         struct timespec64 tv;
         int err;
@@ -134,7 +134,7 @@ COMPAT_SYSCALL_DEFINE1(stime, old_time32_t __user *, tptr)
         return 0;
 }
 
-#endif /* __ARCH_WANT_COMPAT_SYS_TIME */
+#endif /* __ARCH_WANT_SYS_TIME32 */
 #endif
 
 SYSCALL_DEFINE2(gettimeofday, struct timeval __user *, tv,
@@ -263,35 +263,99 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv,
 }
 #endif
 
-SYSCALL_DEFINE1(adjtimex, struct timex __user *, txc_p)
+#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
+SYSCALL_DEFINE1(adjtimex, struct __kernel_timex __user *, txc_p)
 {
-        struct timex txc;               /* Local copy of parameter */
+        struct __kernel_timex txc;              /* Local copy of parameter */
         int ret;
 
         /* Copy the user data space into the kernel copy
          * structure. But bear in mind that the structures
          * may change
          */
-        if (copy_from_user(&txc, txc_p, sizeof(struct timex)))
+        if (copy_from_user(&txc, txc_p, sizeof(struct __kernel_timex)))
                 return -EFAULT;
         ret = do_adjtimex(&txc);
-        return copy_to_user(txc_p, &txc, sizeof(struct timex)) ? -EFAULT : ret;
+        return copy_to_user(txc_p, &txc, sizeof(struct __kernel_timex)) ? -EFAULT : ret;
 }
+#endif
 
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_COMPAT_32BIT_TIME
+int get_old_timex32(struct __kernel_timex *txc, const struct old_timex32 __user *utp)
+{
+        struct old_timex32 tx32;
+
+        memset(txc, 0, sizeof(struct __kernel_timex));
+        if (copy_from_user(&tx32, utp, sizeof(struct old_timex32)))
+                return -EFAULT;
+
+        txc->modes = tx32.modes;
+        txc->offset = tx32.offset;
+        txc->freq = tx32.freq;
+        txc->maxerror = tx32.maxerror;
+        txc->esterror = tx32.esterror;
+        txc->status = tx32.status;
+        txc->constant = tx32.constant;
+        txc->precision = tx32.precision;
+        txc->tolerance = tx32.tolerance;
+        txc->time.tv_sec = tx32.time.tv_sec;
+        txc->time.tv_usec = tx32.time.tv_usec;
+        txc->tick = tx32.tick;
+        txc->ppsfreq = tx32.ppsfreq;
+        txc->jitter = tx32.jitter;
+        txc->shift = tx32.shift;
+        txc->stabil = tx32.stabil;
+        txc->jitcnt = tx32.jitcnt;
+        txc->calcnt = tx32.calcnt;
+        txc->errcnt = tx32.errcnt;
+        txc->stbcnt = tx32.stbcnt;
+
+        return 0;
+}
+
+int put_old_timex32(struct old_timex32 __user *utp, const struct __kernel_timex *txc)
+{
+        struct old_timex32 tx32;
+
+        memset(&tx32, 0, sizeof(struct old_timex32));
+        tx32.modes = txc->modes;
+        tx32.offset = txc->offset;
+        tx32.freq = txc->freq;
+        tx32.maxerror = txc->maxerror;
+        tx32.esterror = txc->esterror;
+        tx32.status = txc->status;
+        tx32.constant = txc->constant;
+        tx32.precision = txc->precision;
+        tx32.tolerance = txc->tolerance;
+        tx32.time.tv_sec = txc->time.tv_sec;
+        tx32.time.tv_usec = txc->time.tv_usec;
+        tx32.tick = txc->tick;
+        tx32.ppsfreq = txc->ppsfreq;
+        tx32.jitter = txc->jitter;
+        tx32.shift = txc->shift;
+        tx32.stabil = txc->stabil;
+        tx32.jitcnt = txc->jitcnt;
+        tx32.calcnt = txc->calcnt;
+        tx32.errcnt = txc->errcnt;
+        tx32.stbcnt = txc->stbcnt;
+        tx32.tai = txc->tai;
+        if (copy_to_user(utp, &tx32, sizeof(struct old_timex32)))
+                return -EFAULT;
+        return 0;
+}
 
-COMPAT_SYSCALL_DEFINE1(adjtimex, struct compat_timex __user *, utp)
+SYSCALL_DEFINE1(adjtimex_time32, struct old_timex32 __user *, utp)
 {
-        struct timex txc;
+        struct __kernel_timex txc;
         int err, ret;
 
-        err = compat_get_timex(&txc, utp);
+        err = get_old_timex32(&txc, utp);
         if (err)
                 return err;
 
         ret = do_adjtimex(&txc);
 
-        err = compat_put_timex(utp, &txc);
+        err = put_old_timex32(utp, &txc);
         if (err)
                 return err;
 
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
index ac5dbf2cd4a2..f986e1918d12 100644
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@ -2234,7 +2234,7 @@ ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, ktime_t *offs_real,
 /**
  * timekeeping_validate_timex - Ensures the timex is ok for use in do_adjtimex
  */
-static int timekeeping_validate_timex(const struct timex *txc)
+static int timekeeping_validate_timex(const struct __kernel_timex *txc)
 {
         if (txc->modes & ADJ_ADJTIME) {
                 /* singleshot must not be used with any other mode bits */
@@ -2300,7 +2300,7 @@ static int timekeeping_validate_timex(const struct timex *txc)
 /**
  * do_adjtimex() - Accessor function to NTP __do_adjtimex function
  */
-int do_adjtimex(struct timex *txc)
+int do_adjtimex(struct __kernel_timex *txc)
 {
         struct timekeeper *tk = &tk_core.timekeeper;
         unsigned long flags;
diff --git a/net/compat.c b/net/compat.c
index 959d1c51826d..2fef7b9db434 100644
--- a/net/compat.c
+++ b/net/compat.c
@@ -822,7 +822,7 @@ COMPAT_SYSCALL_DEFINE5(recvmmsg_time64, int, fd, struct compat_mmsghdr __user *,
 }
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
-COMPAT_SYSCALL_DEFINE5(recvmmsg, int, fd, struct compat_mmsghdr __user *, mmsg,
+COMPAT_SYSCALL_DEFINE5(recvmmsg_time32, int, fd, struct compat_mmsghdr __user *, mmsg,
                        unsigned int, vlen, unsigned int, flags,
                        struct old_timespec32 __user *, timeout)
 {
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index cf931003395f..cc70a64fa81f 100755
--- 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 */