From 62bf2ee17cdb3ef0ae5b671c246b81ae82f46809 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Sat, 2 Mar 2013 12:26:30 +0100 Subject: [PATCH] --- yaml --- r: 360213 b: refs/heads/master c: 0e803bafbb7d1b8a9031104f1a982a01b45da4c6 h: refs/heads/master i: 360211: acde1ab9c62c6bb5cdd0ccd56af8fd55ddb3d54b v: v3 --- [refs] | 2 +- trunk/fs/timerfd.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a506455b1d8e..8c60d992fb2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dfbb83d32c99dc50198638adf067a435c0fc338f +refs/heads/master: 0e803bafbb7d1b8a9031104f1a982a01b45da4c6 diff --git a/trunk/fs/timerfd.c b/trunk/fs/timerfd.c index 0e606b12a59d..32b644f03690 100644 --- a/trunk/fs/timerfd.c +++ b/trunk/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