Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux] / fs / select.c

diff --git a/fs/select.c b/fs/select.c
index 4a6b6e4..22b3bf8 100644 (file)
--- a/fs/select.c
+++ b/fs/select.c
@@ -1120,7 +1120,7 @@ int compat_poll_select_copy_remaining(struct timespec64 *end_time, void __user *
                ts.tv_sec = ts.tv_nsec = 0;
 
        if (timeval) {
-               struct compat_timeval rtv;
+               struct old_timeval32 rtv;
 
                rtv.tv_sec = ts.tv_sec;
                rtv.tv_usec = ts.tv_nsec / NSEC_PER_USEC;
@@ -1128,7 +1128,7 @@ int compat_poll_select_copy_remaining(struct timespec64 *end_time, void __user *
                if (!copy_to_user(p, &rtv, sizeof(rtv)))
                        return ret;
        } else {
-               if (!compat_put_timespec64(&ts, p))
+               if (!put_old_timespec32(&ts, p))
                        return ret;
        }
        /*
@@ -1257,10 +1257,10 @@ out_nofds:
 
 static int do_compat_select(int n, compat_ulong_t __user *inp,
        compat_ulong_t __user *outp, compat_ulong_t __user *exp,
-       struct compat_timeval __user *tvp)
+       struct old_timeval32 __user *tvp)
 {
        struct timespec64 end_time, *to = NULL;
-       struct compat_timeval tv;
+       struct old_timeval32 tv;
        int ret;
 
        if (tvp) {
@@ -1282,7 +1282,7 @@ static int do_compat_select(int n, compat_ulong_t __user *inp,
 
 COMPAT_SYSCALL_DEFINE5(select, int, n, compat_ulong_t __user *, inp,
        compat_ulong_t __user *, outp, compat_ulong_t __user *, exp,
-       struct compat_timeval __user *, tvp)
+       struct old_timeval32 __user *, tvp)
 {
        return do_compat_select(n, inp, outp, exp, tvp);
 }
@@ -1307,7 +1307,7 @@ COMPAT_SYSCALL_DEFINE1(old_select, struct compat_sel_arg_struct __user *, arg)
 
 static long do_compat_pselect(int n, compat_ulong_t __user *inp,
        compat_ulong_t __user *outp, compat_ulong_t __user *exp,
-       struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask,
+       struct old_timespec32 __user *tsp, compat_sigset_t __user *sigmask,
        compat_size_t sigsetsize)
 {
        sigset_t ksigmask, sigsaved;
@@ -1315,7 +1315,7 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp,
        int ret;
 
        if (tsp) {
-               if (compat_get_timespec64(&ts, tsp))
+               if (get_old_timespec32(&ts, tsp))
                        return -EFAULT;
 
                to = &end_time;
@@ -1355,7 +1355,7 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp,
 
 COMPAT_SYSCALL_DEFINE6(pselect6, int, n, compat_ulong_t __user *, inp,
        compat_ulong_t __user *, outp, compat_ulong_t __user *, exp,
-       struct compat_timespec __user *, tsp, void __user *, sig)
+       struct old_timespec32 __user *, tsp, void __user *, sig)
 {
        compat_size_t sigsetsize = 0;
        compat_uptr_t up = 0;
@@ -1373,7 +1373,7 @@ COMPAT_SYSCALL_DEFINE6(pselect6, int, n, compat_ulong_t __user *, inp,
 }
 
 COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds,
-       unsigned int,  nfds, struct compat_timespec __user *, tsp,
+       unsigned int,  nfds, struct old_timespec32 __user *, tsp,
        const compat_sigset_t __user *, sigmask, compat_size_t, sigsetsize)
 {
        sigset_t ksigmask, sigsaved;
@@ -1381,7 +1381,7 @@ COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds,
        int ret;
 
        if (tsp) {
-               if (compat_get_timespec64(&ts, tsp))
+               if (get_old_timespec32(&ts, tsp))
                        return -EFAULT;
 
                to = &end_time;