diff --git a/[refs] b/[refs] index d5b775105246..0afb50feb994 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 481c5346d0981940ee63037eb53e4e37b0735c10 +refs/heads/master: 55d8538498f62ec72b5ba67aa386c7726f630475 diff --git a/trunk/fs/select.c b/trunk/fs/select.c index 8dda969614a9..da0e88201c3a 100644 --- a/trunk/fs/select.c +++ b/trunk/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))