[PATCH] alpha: make poll flags the same as other architectures

[mv-sheeva.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index a2ba78bdf7f71384de2491779e8f83627e6ca4b0..ef5a0771592d1a5d30d2cb9eb53799ed2c862520 100644 (file)
--- a/fs/compat.c
+++ b/fs/compat.c
@@ -114,6 +114,7 @@ asmlinkage long compat_sys_newlstat(char __user * filename,
        return error;
 }
 
+#ifndef __ARCH_WANT_STAT64
 asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename,
                struct compat_stat __user *statbuf, int flag)
 {
@@ -134,6 +135,7 @@ asmlinkage long compat_sys_newfstatat(unsigned int dfd, char __user *filename,
 out:
        return error;
 }
+#endif
 
 asmlinkage long compat_sys_newfstat(unsigned int fd,
                struct compat_stat __user * statbuf)
@@ -1474,10 +1476,9 @@ int compat_do_execve(char * filename,
        int i;
 
        retval = -ENOMEM;
-       bprm = kmalloc(sizeof(*bprm), GFP_KERNEL);
+       bprm = kzalloc(sizeof(*bprm), GFP_KERNEL);
        if (!bprm)
                goto out_ret;
-       memset(bprm, 0, sizeof(*bprm));
 
        file = open_exec(filename);
        retval = PTR_ERR(file);
@@ -1757,7 +1758,7 @@ asmlinkage long compat_sys_select(int n, compat_ulong_t __user *inp,
                        goto sticky;
                rtv.tv_usec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ));
                rtv.tv_sec = timeout;
-               if (compat_timeval_compare(&rtv, &tv) < 0)
+               if (compat_timeval_compare(&rtv, &tv) >= 0)
                        rtv = tv;
                if (copy_to_user(tvp, &rtv, sizeof(rtv))) {
 sticky:
@@ -1834,7 +1835,7 @@ asmlinkage long compat_sys_pselect7(int n, compat_ulong_t __user *inp,
                        rts.tv_sec++;
                        rts.tv_nsec -= NSEC_PER_SEC;
                }
-               if (compat_timespec_compare(&rts, &ts) < 0)
+               if (compat_timespec_compare(&rts, &ts) >= 0)
                        rts = ts;
                copy_to_user(tsp, &rts, sizeof(rts));
        }
@@ -1934,7 +1935,7 @@ asmlinkage long compat_sys_ppoll(struct pollfd __user *ufds,
                rts.tv_nsec = jiffies_to_usecs(do_div((*(u64*)&timeout), HZ)) *
                                        1000;
                rts.tv_sec = timeout;
-               if (compat_timespec_compare(&rts, &ts) < 0)
+               if (compat_timespec_compare(&rts, &ts) >= 0)
                        rts = ts;
                if (copy_to_user(tsp, &rts, sizeof(rts))) {
 sticky:
@@ -2168,9 +2169,12 @@ asmlinkage long compat_sys_nfsservctl(int cmd, struct compat_nfsctl_arg __user *
 
        default:
                err = -EINVAL;
-               goto done;
+               break;
        }
 
+       if (err)
+               goto done;
+
        oldfs = get_fs();
        set_fs(KERNEL_DS);
        /* The __user pointer casts are valid because of the set_fs() */