compat: restore timerfd settime and gettime compat syscalls
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Sat, 2 Mar 2013 11:26:30 +0000 (12:26 +0100)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 2 Mar 2013 14:35:13 +0000 (09:35 -0500)
Both compat syscalls got lost with 9d94b9e2 "switch timerfd compat syscalls
to COMPAT_SYSCALL_DEFINE" because of a typo:
COMPAT instead of CONFIG_COMPAT.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/timerfd.c

index 0e606b12a59df966b5509e87016d6782034ee473..32b644f0369020a1c11e1fc7378bae581e4185c7 100644 (file)
@@ -383,10 +383,10 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr)
        return copy_to_user(otmr, &kotmr, sizeof(kotmr)) ? -EFAULT: 0;
 }
 
-#ifdef COMPAT
+#ifdef CONFIG_COMPAT
 COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
-               const struct itimerspec __user *, utmr,
-               struct itimerspec __user *, otmr)
+               const struct compat_itimerspec __user *, utmr,
+               struct compat_itimerspec __user *, otmr)
 {
        struct itimerspec new, old;
        int ret;
@@ -402,12 +402,12 @@ COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags,
 }
 
 COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd,
-               struct itimerspec __user *, otmr)
+               struct compat_itimerspec __user *, otmr)
 {
        struct itimerspec kotmr;
        int ret = do_timerfd_gettime(ufd, &kotmr);
        if (ret)
                return ret;
-       return put_compat_itimerspec(otmr, &t) ? -EFAULT: 0;
+       return put_compat_itimerspec(otmr, &kotmr) ? -EFAULT: 0;
 }
 #endif