projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[linux-2.6-microblaze.git]
/
fs
/
select.c
diff --git
a/fs/select.c
b/fs/select.c
index
79d0d49
..
8692939
100644
(file)
--- a/
fs/select.c
+++ b/
fs/select.c
@@
-70,9
+70,9
@@
static long __estimate_accuracy(struct timespec *tv)
return slack;
}
return slack;
}
-
long
select_estimate_accuracy(struct timespec *tv)
+
u64
select_estimate_accuracy(struct timespec *tv)
{
{
- u
nsigned long
ret;
+ u
64
ret;
struct timespec now;
/*
struct timespec now;
/*
@@
-402,7
+402,7
@@
int do_select(int n, fd_set_bits *fds, struct timespec *end_time)
struct poll_wqueues table;
poll_table *wait;
int retval, i, timed_out = 0;
struct poll_wqueues table;
poll_table *wait;
int retval, i, timed_out = 0;
- u
nsigned long
slack = 0;
+ u
64
slack = 0;
unsigned int busy_flag = net_busy_loop_on() ? POLL_BUSY_LOOP : 0;
unsigned long busy_end = 0;
unsigned int busy_flag = net_busy_loop_on() ? POLL_BUSY_LOOP : 0;
unsigned long busy_end = 0;
@@
-784,7
+784,7
@@
static int do_poll(struct poll_list *list, struct poll_wqueues *wait,
poll_table* pt = &wait->pt;
ktime_t expire, *to = NULL;
int timed_out = 0, count = 0;
poll_table* pt = &wait->pt;
ktime_t expire, *to = NULL;
int timed_out = 0, count = 0;
- u
nsigned long
slack = 0;
+ u
64
slack = 0;
unsigned int busy_flag = net_busy_loop_on() ? POLL_BUSY_LOOP : 0;
unsigned long busy_end = 0;
unsigned int busy_flag = net_busy_loop_on() ? POLL_BUSY_LOOP : 0;
unsigned long busy_end = 0;