diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-03-02 06:26:30 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-02 09:35:13 -0500 |
| commit | 0e803bafbb7d1b8a9031104f1a982a01b45da4c6 (patch) | |
| tree | e78f8e13f68a7abf4220fb4f306cae2c2d28cc79 | |
| parent | dfbb83d32c99dc50198638adf067a435c0fc338f (diff) | |
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>
| -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 0e606b12a59d..32b644f03690 100644 --- a/fs/timerfd.c +++ b/fs/timerfd.c | |||
| @@ -383,10 +383,10 @@ SYSCALL_DEFINE2(timerfd_gettime, int, ufd, struct itimerspec __user *, otmr) | |||
| 383 | return copy_to_user(otmr, &kotmr, sizeof(kotmr)) ? -EFAULT: 0; | 383 | return copy_to_user(otmr, &kotmr, sizeof(kotmr)) ? -EFAULT: 0; |
| 384 | } | 384 | } |
| 385 | 385 | ||
| 386 | #ifdef COMPAT | 386 | #ifdef CONFIG_COMPAT |
| 387 | COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, | 387 | COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, |
| 388 | const struct itimerspec __user *, utmr, | 388 | const struct compat_itimerspec __user *, utmr, |
| 389 | struct itimerspec __user *, otmr) | 389 | struct compat_itimerspec __user *, otmr) |
| 390 | { | 390 | { |
| 391 | struct itimerspec new, old; | 391 | struct itimerspec new, old; |
| 392 | int ret; | 392 | int ret; |
| @@ -402,12 +402,12 @@ COMPAT_SYSCALL_DEFINE4(timerfd_settime, int, ufd, int, flags, | |||
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd, | 404 | COMPAT_SYSCALL_DEFINE2(timerfd_gettime, int, ufd, |
| 405 | struct itimerspec __user *, otmr) | 405 | struct compat_itimerspec __user *, otmr) |
| 406 | { | 406 | { |
| 407 | struct itimerspec kotmr; | 407 | struct itimerspec kotmr; |
| 408 | int ret = do_timerfd_gettime(ufd, &kotmr); | 408 | int ret = do_timerfd_gettime(ufd, &kotmr); |
| 409 | if (ret) | 409 | if (ret) |
| 410 | return ret; | 410 | return ret; |
| 411 | return put_compat_itimerspec(otmr, &t) ? -EFAULT: 0; | 411 | return put_compat_itimerspec(otmr, &kotmr) ? -EFAULT: 0; |
| 412 | } | 412 | } |
| 413 | #endif | 413 | #endif |
