Merge tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[linux-2.6-block.git] / fs / timerfd.c

diff --git a/fs/timerfd.c b/fs/timerfd.c
index d69ad801eb8039af7f19054d32791d48b40589aa..803ca070d42e16f6b278c33586a200ce56421f60 100644 (file)
--- a/fs/timerfd.c
+++ b/fs/timerfd.c
@@ -561,29 +561,29 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct __kernel_itimerspec __user *,
 
 #ifdef CONFIG_COMPAT_32BIT_TIME
 COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
-               const struct compat_itimerspec __user *, utmr,
-               struct compat_itimerspec __user *, otmr)
+               const struct old_itimerspec32 __user *, utmr,
+               struct old_itimerspec32 __user *, otmr)
 {
        struct itimerspec64 new, old;
        int ret;
 
-       if (get_compat_itimerspec64(&new, utmr))
+       if (get_old_itimerspec32(&new, utmr))
                return -EFAULT;
        ret = do_timerfd_settime(ufd, flags, &new, &old);
        if (ret)
                return ret;
-       if (otmr && put_compat_itimerspec64(&old, otmr))
+       if (otmr && put_old_itimerspec32(&old, otmr))
                return -EFAULT;
        return ret;
 }
 
 COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd,
-               struct compat_itimerspec __user *, otmr)
+               struct old_itimerspec32 __user *, otmr)
 {
        struct itimerspec64 kotmr;
        int ret = do_timerfd_gettime(ufd, &kotmr);
        if (ret)
                return ret;
-       return put_compat_itimerspec64(&kotmr, otmr) ? -EFAULT : 0;
+       return put_old_itimerspec32(&kotmr, otmr) ? -EFAULT : 0;
 }
 #endif