diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 06:32:01 -0400 |
| commit | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (patch) | |
| tree | 547fd497a80818a60ac36831377d5df97868173c /fs/select.c | |
| parent | 0e50a4c6ab94ffe7e5515b86b5df9e5abc8c6b13 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
Merge branch 'linus' into x86/pebs
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/select.c b/fs/select.c index 8dda969614a9..da0e88201c3a 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -249,7 +249,6 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) | |||
| 249 | retval++; | 249 | retval++; |
| 250 | } | 250 | } |
| 251 | } | 251 | } |
| 252 | cond_resched(); | ||
| 253 | } | 252 | } |
| 254 | if (res_in) | 253 | if (res_in) |
| 255 | *rinp = res_in; | 254 | *rinp = res_in; |
| @@ -257,6 +256,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) | |||
| 257 | *routp = res_out; | 256 | *routp = res_out; |
| 258 | if (res_ex) | 257 | if (res_ex) |
| 259 | *rexp = res_ex; | 258 | *rexp = res_ex; |
| 259 | cond_resched(); | ||
| 260 | } | 260 | } |
| 261 | wait = NULL; | 261 | wait = NULL; |
| 262 | if (retval || !*timeout || signal_pending(current)) | 262 | if (retval || !*timeout || signal_pending(current)) |