Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / include / linux / compat.h

diff --git a/include/linux/compat.h b/include/linux/compat.h
index c4c389c7e1b4221db8ed4b987ba34e5023425f6d..68f79d855c3d2cdf163e48cef0f23dd258e1ad1d 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -116,14 +116,7 @@ typedef __compat_gid32_t   compat_gid_t;
 struct compat_sel_arg_struct;
 struct rusage;
 
-struct compat_itimerval {
-       struct old_timeval32    it_interval;
-       struct old_timeval32    it_value;
-};
-
-struct itimerval;
-int get_compat_itimerval(struct itimerval *, const struct compat_itimerval __user *);
-int put_compat_itimerval(struct compat_itimerval __user *, const struct itimerval *);
+struct old_itimerval32;
 
 struct compat_tms {
        compat_clock_t          tms_utime;
@@ -666,10 +659,10 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
 
 /* kernel/itimer.c */
 asmlinkage long compat_sys_getitimer(int which,
-                                    struct compat_itimerval __user *it);
+                                    struct old_itimerval32 __user *it);
 asmlinkage long compat_sys_setitimer(int which,
-                                    struct compat_itimerval __user *in,
-                                    struct compat_itimerval __user *out);
+                                    struct old_itimerval32 __user *in,
+                                    struct old_itimerval32 __user *out);
 
 /* kernel/kexec.c */
 asmlinkage long compat_sys_kexec_load(compat_ulong_t entry,
@@ -935,10 +928,10 @@ static inline bool in_compat_syscall(void) { return is_compat_task(); }
  */
 static inline struct old_timeval32 ns_to_old_timeval32(s64 nsec)
 {
-       struct timeval tv;
+       struct __kernel_old_timeval tv;
        struct old_timeval32 ctv;
 
-       tv = ns_to_timeval(nsec);
+       tv = ns_to_kernel_old_timeval(nsec);
        ctv.tv_sec = tv.tv_sec;
        ctv.tv_usec = tv.tv_usec;