vfs: do bulk POLL* -> EPOLL* replacement

[linux-2.6-block.git] / fs / proc / proc_sysctl.c

diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 63325377621a91d814fbc348b4902341b80bee97..c41ab261397df2875951db47ea38b7cbe2a5bae1 100644 (file)
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -640,7 +640,7 @@ static __poll_t proc_sys_poll(struct file *filp, poll_table *wait)
 
        /* sysctl was unregistered */
        if (IS_ERR(head))
-               return POLLERR | POLLHUP;
+               return EPOLLERR | EPOLLHUP;
 
        if (!table->proc_handler)
                goto out;
@@ -653,7 +653,7 @@ static __poll_t proc_sys_poll(struct file *filp, poll_table *wait)
 
        if (event != atomic_read(&table->poll->event)) {
                filp->private_data = proc_sys_poll_event(table->poll);
-               ret = POLLIN | POLLRDNORM | POLLERR | POLLPRI;
+               ret = EPOLLIN | EPOLLRDNORM | EPOLLERR | EPOLLPRI;
        }
 
 out: