git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs...
[pandora-kernel.git]
/
fs
/
select.c
diff --git
a/fs/select.c
b/fs/select.c
index
500a669
..
b7b10aa
100644
(file)
--- a/
fs/select.c
+++ b/
fs/select.c
@@
-67,7
+67,7
@@
static long __estimate_accuracy(struct timespec *tv)
return slack;
}
return slack;
}
-
static long
estimate_accuracy(struct timespec *tv)
+
long select_
estimate_accuracy(struct timespec *tv)
{
unsigned long ret;
struct timespec now;
{
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)
}
if (end_time && !timed_out)
- slack = estimate_accuracy(end_time);
+ slack =
select_
estimate_accuracy(end_time);
retval = 0;
for (;;) {
retval = 0;
for (;;) {
@@
-769,7
+769,7
@@
static int do_poll(unsigned int nfds, struct poll_list *list,
}
if (end_time && !timed_out)
}
if (end_time && !timed_out)
- slack = estimate_accuracy(end_time);
+ slack =
select_
estimate_accuracy(end_time);
for (;;) {
struct poll_list *walk;
for (;;) {
struct poll_list *walk;