diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-03-02 12:26:30 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-02 09:35:13 -0500 |
| commit | 0e803bafbb7d1b8a9031104f1a982a01b45da4c6 (patch) | |
| tree | e78f8e13f68a7abf4220fb4f306cae2c2d28cc79 /fs/timerfd.c | |
| parent | dfbb83d32c99dc50198638adf067a435c0fc338f (diff) | |
| download | op-kernel-dev-0e803bafbb7d1b8a9031104f1a982a01b45da4c6.zip op-kernel-dev-0e803bafbb7d1b8a9031104f1a982a01b45da4c6.tar.gz | |
compat: restore timerfd settime and gettime compat syscalls
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>
Diffstat (limited to 'fs/timerfd.c')
| -rw-r--r-- | fs/timerfd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/timerfd.c b/fs/timerfd.c index 0e606b1..32b644f 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c @@ -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 |
