5 files changed, 16 insertions, 14 deletions

diff --git a/include/linux/restart_block.h b/include/linux/restart_block.h
index bcfdb918cd81..5d83d0c1d06c 100644
--- a/include/linux/restart_block.h
+++ b/include/linux/restart_block.h
@@ -7,6 +7,7 @@
 
 #include <linux/compiler.h>
 #include <linux/types.h>
+#include <linux/time64.h>
 
 struct timespec;
 struct compat_timespec;
@@ -15,9 +16,7 @@ struct pollfd;
 enum timespec_type {
         TT_NONE         = 0,
         TT_NATIVE       = 1,
-#ifdef CONFIG_COMPAT
         TT_COMPAT       = 2,
-#endif
 };
 
 /*
@@ -40,10 +39,8 @@ struct restart_block {
                         clockid_t clockid;
                         enum timespec_type type;
                         union {
-                                struct timespec __user *rmtp;
-#ifdef CONFIG_COMPAT
+                                struct __kernel_timespec __user *rmtp;
                                 struct compat_timespec __user *compat_rmtp;
-#endif
                         };
                         u64 expires;
                 } nanosleep;
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 40bb40d1741b..c9a2a2601852 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -536,7 +536,8 @@ asmlinkage long sys_set_robust_list(struct robust_list_head __user *head,
                                     size_t len);
 
 /* kernel/hrtimer.c */
-asmlinkage long sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp);
+asmlinkage long sys_nanosleep(struct __kernel_timespec __user *rqtp,
+                              struct __kernel_timespec __user *rmtp);
 
 /* kernel/itimer.c */
 asmlinkage long sys_getitimer(int which, struct itimerval __user *value);
@@ -573,8 +574,8 @@ asmlinkage long sys_clock_gettime(clockid_t which_clock,
 asmlinkage long sys_clock_getres(clockid_t which_clock,
                                 struct __kernel_timespec __user *tp);
 asmlinkage long sys_clock_nanosleep(clockid_t which_clock, int flags,
-                                const struct timespec __user *rqtp,
-                                struct timespec __user *rmtp);
+                                const struct __kernel_timespec __user *rqtp,
+                                struct __kernel_timespec __user *rmtp);
 
 /* kernel/printk.c */
 asmlinkage long sys_syslog(int type, char __user *buf, int len);
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index f183257ff0c6..d7051b3993b5 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1747,8 +1747,10 @@ out:
         return ret;
 }
 
-SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
-                struct timespec __user *, rmtp)
+#if !defined(CONFIG_64BIT_TIME) || defined(CONFIG_64BIT)
+
+SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp,
+                struct __kernel_timespec __user *, rmtp)
 {
         struct timespec64 tu;
 
@@ -1763,6 +1765,8 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
         return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
 }
 
+#endif
+
 #ifdef CONFIG_COMPAT_32BIT_TIME
 
 COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c
index 4e76021cea7f..474e4ca2e28f 100644
--- a/kernel/time/posix-stubs.c
+++ b/kernel/time/posix-stubs.c
@@ -126,8 +126,8 @@ SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, struct __kernel_time
 }
 
 SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
-                const struct timespec __user *, rqtp,
-                struct timespec __user *, rmtp)
+                const struct __kernel_timespec __user *, rqtp,
+                struct __kernel_timespec __user *, rmtp)
 {
         struct timespec64 t;
 
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
index 93b2c38ad0f3..c21f4c4f8660 100644
--- a/kernel/time/posix-timers.c
+++ b/kernel/time/posix-timers.c
@@ -1212,8 +1212,8 @@ static int common_nsleep(const clockid_t which_clock, int flags,
 }
 
 SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags,
-                const struct timespec __user *, rqtp,
-                struct timespec __user *, rmtp)
+                const struct __kernel_timespec __user *, rqtp,
+                struct __kernel_timespec __user *, rmtp)
 {
         const struct k_clock *kc = clockid_to_kclock(which_clock);
         struct timespec64 t;