diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:23:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-02 11:23:14 -0700 |
| commit | b66e1f11ebc429569a3784aaf64123633d9e3ed1 (patch) | |
| tree | d49f96acc682aaf29416921428110da5fd78fea4 /fs/select.c | |
| parent | 1be1d6b7f3f6e3a87f872dd5e7a867d03d8a6851 (diff) | |
| parent | 5c598b3428c372a1209597cee99a70da20625876 (diff) | |
| download | kernel-crypto-b66e1f11ebc429569a3784aaf64123633d9e3ed1.tar.gz kernel-crypto-b66e1f11ebc429569a3784aaf64123633d9e3ed1.tar.xz kernel-crypto-b66e1f11ebc429569a3784aaf64123633d9e3ed1.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
[PATCH] fix sysctl_nr_open bugs
[PATCH] sanitize anon_inode_getfd()
[PATCH] split linux/file.h
[PATCH] make osf_select() use core_sys_select()
[PATCH] remove horrors with irix tty ioctls handling
[PATCH] fix file and descriptor handling in perfmon
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/select.c b/fs/select.c index 2c292146e24..8dda969614a 100644 --- a/fs/select.c +++ b/fs/select.c @@ -21,6 +21,7 @@ #include <linux/poll.h> #include <linux/personality.h> /* for STICKY_TIMEOUTS */ #include <linux/file.h> +#include <linux/fdtable.h> #include <linux/fs.h> #include <linux/rcupdate.h> @@ -298,7 +299,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) #define MAX_SELECT_SECONDS \ ((unsigned long) (MAX_SCHEDULE_TIMEOUT / HZ)-1) -static int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp, +int core_sys_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, s64 *timeout) { fd_set_bits fds; |