projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
ocfs2: fix occurring deadlock by changing ocfs2_wq from global to local
[cascardo/linux.git]
/
fs
/
eventpoll.c
diff --git
a/fs/eventpoll.c
b/fs/eventpoll.c
index
cde6074
..
8a74a2a
100644
(file)
--- a/
fs/eventpoll.c
+++ b/
fs/eventpoll.c
@@
-1616,7
+1616,7
@@
static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
{
int res = 0, eavail, timed_out = 0;
unsigned long flags;
-
long
slack = 0;
+
u64
slack = 0;
wait_queue_t wait;
ktime_t expires, *to = NULL;