Merge to Fedora Core 2 kernel-2.6.8-1.521

[linux-2.6.git] / include / linux / poll.h

diff --git a/include/linux/poll.h b/include/linux/poll.h
index a44feb5..b4bb681 100644 (file)
--- a/include/linux/poll.h
+++ b/include/linux/poll.h
@@ -82,14 +82,10 @@ int get_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset)
 }
 
 static inline
-int set_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset)
+void set_fd_set(unsigned long nr, void __user *ufdset, unsigned long *fdset)
 {
-       int ret = 0;
        if (ufdset)
-               ret = __copy_to_user(ufdset, fdset, FDS_BYTES(nr));
-       if (ret)
-               return -EFAULT;
-       return 0;
+               __copy_to_user(ufdset, fdset, FDS_BYTES(nr));
 }
 
 static inline