projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm: dts: rockchip: add mpu6050 to rk3288-evb-act8846
[firefly-linux-kernel-4.4.55.git]
/
fs
/
eventpoll.c
diff --git
a/fs/eventpoll.c
b/fs/eventpoll.c
index 1e009cad8d5cac61832ebb3916033780f2fec1a6..3ab9c68b8bcee45fee7386140194da2f7d7b859d 100644
(file)
--- a/
fs/eventpoll.c
+++ b/
fs/eventpoll.c
@@
-34,6
+34,7
@@
#include <linux/mutex.h>
#include <linux/anon_inodes.h>
#include <linux/device.h>
#include <linux/mutex.h>
#include <linux/anon_inodes.h>
#include <linux/device.h>
+#include <linux/freezer.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/mman.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/mman.h>
@@
-1587,7
+1588,7
@@
static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events,
{
int res = 0, eavail, timed_out = 0;
unsigned long flags;
{
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;
wait_queue_t wait;
ktime_t expires, *to = NULL;
@@
-1634,7
+1635,8
@@
fetch_events:
}
spin_unlock_irqrestore(&ep->lock, flags);
}
spin_unlock_irqrestore(&ep->lock, flags);
- if (!schedule_hrtimeout_range(to, slack, HRTIMER_MODE_ABS))
+ if (!freezable_schedule_hrtimeout_range(to, slack,
+ HRTIMER_MODE_ABS))
timed_out = 1;
spin_lock_irqsave(&ep->lock, flags);
timed_out = 1;
spin_lock_irqsave(&ep->lock, flags);