diff options
| author | Jens Axboe <jaxboe@fusionio.com> | 2010-11-16 04:09:42 -0500 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-11-16 04:09:42 -0500 |
| commit | a02056349cdea2252cd2b21643ebf025e83a29f2 (patch) | |
| tree | b7c889d6cbe8e7188d07d99a5c9da858c53a5b6c /fs/select.c | |
| parent | 34db1d595ef6f183fbc1e42cda45a3dfa0035258 (diff) | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 (diff) | |
Merge branch 'v2.6.37-rc2' into for-2.6.38/core
Diffstat (limited to 'fs/select.c')
| -rw-r--r-- | fs/select.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/select.c b/fs/select.c index 500a669f7790..b7b10aa30861 100644 --- a/fs/select.c +++ b/fs/select.c | |||
| @@ -67,7 +67,7 @@ static long __estimate_accuracy(struct timespec *tv) | |||
| 67 | return slack; | 67 | return slack; |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | static long estimate_accuracy(struct timespec *tv) | 70 | long select_estimate_accuracy(struct timespec *tv) |
| 71 | { | 71 | { |
| 72 | unsigned long ret; | 72 | unsigned long ret; |
| 73 | struct timespec now; | 73 | struct timespec now; |
| @@ -417,7 +417,7 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time) | |||
| 417 | } | 417 | } |
| 418 | 418 | ||
| 419 | if (end_time && !timed_out) | 419 | if (end_time && !timed_out) |
| 420 | slack = estimate_accuracy(end_time); | 420 | slack = select_estimate_accuracy(end_time); |
| 421 | 421 | ||
| 422 | retval = 0; | 422 | retval = 0; |
| 423 | for (;;) { | 423 | for (;;) { |
| @@ -769,7 +769,7 @@ static int do_poll(unsigned int nfds, struct poll_list *list, | |||
| 769 | } | 769 | } |
| 770 | 770 | ||
| 771 | if (end_time && !timed_out) | 771 | if (end_time && !timed_out) |
| 772 | slack = estimate_accuracy(end_time); | 772 | slack = select_estimate_accuracy(end_time); |
| 773 | 773 | ||
| 774 | for (;;) { | 774 | for (;;) { |
| 775 | struct poll_list *walk; | 775 | struct poll_list *walk; |