projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
vfs: do bulk POLL* -> EPOLL* replacement
[linux-2.6-block.git]
/
fs
/
proc
/
kmsg.c
diff --git
a/fs/proc/kmsg.c
b/fs/proc/kmsg.c
index f0bfb45c3f9fea791d65816efed720e4f21f11a1..4f4a2abb225eb99a1621d6c74c34cdbe90959e41 100644
(file)
--- a/
fs/proc/kmsg.c
+++ b/
fs/proc/kmsg.c
@@
-44,7
+44,7
@@
static __poll_t kmsg_poll(struct file *file, poll_table *wait)
{
poll_wait(file, &log_wait, wait);
if (do_syslog(SYSLOG_ACTION_SIZE_UNREAD, NULL, 0, SYSLOG_FROM_PROC))
- return
POLLIN |
POLLRDNORM;
+ return
EPOLLIN | E
POLLRDNORM;
return 0;
}