diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 14:27:56 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 14:27:56 +0400 |
| commit | 97e6722b8d6b5880c4d5751127d5083b1b7df27d (patch) | |
| tree | 060c52298d42530f975064f7addc4e637fe00289 /fs/select.c | |
| parent | f22f9a89ce6857d377bf22dba4c1a8cd256c5136 (diff) | |
| parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) | |
| download | linux-97e6722b8d6b5880c4d5751127d5083b1b7df27d.tar.xz | |
Merge branch 'linus' into tracing/ftrace
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) retval++; } } - cond_resched(); } if (res_in) *rinp = res_in; @@ -257,6 +256,7 @@ int do_select(int n, fd_set_bits *fds, s64 *timeout) *routp = res_out; if (res_ex) *rexp = res_ex; + cond_resched(); } wait = NULL; if (retval || !*timeout || signal_pending(current)) |