From b377a332f4e96139fd39d86fdd61c50c10e3704f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 27 Oct 2010 15:34:53 -0700 Subject: [PATCH] --- yaml --- r: 218623 b: refs/heads/master c: 231f3d393f63f6e3b505afa179999bba491d0f08 h: refs/heads/master i: 218621: 210fc5f5199d9497182bce7912a17b14b8138c49 218619: 89333fe429699ead96a747e82a52aa15b584f3f9 218615: f9c9dd1df1dd1c2a342027851b6255e5ed9043ca 218607: a4c7d9ad012df6d4eb394716df4f0a073dec093c 218591: 6f5ca35f6db8942624dc84a912c5085d45c785ca 218559: d808516a39d5efbd6e0510e9bb1deb60090f20e5 218495: 166c1fda812678262fad9821b7295671ed2a75b6 218367: 31b73434573625eebdd7febc9a5a7f1793a015be 218111: 66d32e678627b59e2c45bde8db417154cf85e6d0 v: v3 --- [refs] | 2 +- trunk/fs/select.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f0281ff9f172..11f60ac8cb8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61d8e11e519ee7912ab59610fba1aaf08e3c1d84 +refs/heads/master: 231f3d393f63f6e3b505afa179999bba491d0f08 diff --git a/trunk/fs/select.c b/trunk/fs/select.c index 500a669f7790..5f023f911202 100644 --- a/trunk/fs/select.c +++ b/trunk/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;