author: Andrew Morton <akpm@linux-foundation.org> 2010-10-27 15:34:53 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2010-10-27 18:03:18 -0700
commit: 231f3d393f63f6e3b505afa179999bba491d0f08
parent: 61d8e11e519ee7912ab59610fba1aaf08e3c1d84
Commit Summary:
Diffstat:
1 file changed, 3 insertions, 3 deletions
diff --git a/fs/select.c b/fs/select.c
index 500a669f7790..5f023f911202 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -67,7 +67,7 @@ static long __estimate_accuracy(struct timespec *tv)
return slack;
}
-static long estimate_accuracy(struct timespec *tv)
+static long select_estimate_accuracy(struct timespec *tv)
{
unsigned long ret;
struct timespec now;
@@ -417,7 +417,7 @@ int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
}
if (end_time && !timed_out)
- slack = estimate_accuracy(end_time);
+ slack = select_estimate_accuracy(end_time);
retval = 0;
for (;;) {
@@ -769,7 +769,7 @@ static int do_poll(unsigned int nfds, struct poll_list *list,
}
if (end_time && !timed_out)
- slack = estimate_accuracy(end_time);
+ slack = select_estimate_accuracy(end_time);
for (;;) {
struct poll_list *walk;