OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dma-mapping-4.16-2' of git://git.infradead.org/users/hch/dma-mapping
[uclinux-h8/linux.git]
/
fs
/
timerfd.c
diff --git
a/fs/timerfd.c
b/fs/timerfd.c
index
0510717
..
cdad49d
100644
(file)
--- a/
fs/timerfd.c
+++ b/
fs/timerfd.c
@@
-237,7
+237,7
@@
static __poll_t timerfd_poll(struct file *file, poll_table *wait)
spin_lock_irqsave(&ctx->wqh.lock, flags);
if (ctx->ticks)
- events |= POLLIN;
+ events |=
E
POLLIN;
spin_unlock_irqrestore(&ctx->wqh.lock, flags);
return events;