vfs: do bulk POLL* -> EPOLL* replacement

[zynq/linux.git] / kernel / printk / printk.c

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index db4b9b8929ebf9afb425e36c3908b9f3ca1908e9..fc1123583fa6edadb19214bb1922f7ce4ccdf1e1 100644 (file)
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -930,7 +930,7 @@ static __poll_t devkmsg_poll(struct file *file, poll_table *wait)
        __poll_t ret = 0;
 
        if (!user)
-               return POLLERR|POLLNVAL;
+               return EPOLLERR|EPOLLNVAL;
 
        poll_wait(file, &log_wait, wait);
 
@@ -938,9 +938,9 @@ static __poll_t devkmsg_poll(struct file *file, poll_table *wait)
        if (user->seq < log_next_seq) {
                /* return error when data has vanished underneath us */
                if (user->seq < log_first_seq)
-                       ret = POLLIN|POLLRDNORM|POLLERR|POLLPRI;
+                       ret = EPOLLIN|EPOLLRDNORM|EPOLLERR|EPOLLPRI;
                else
-                       ret = POLLIN|POLLRDNORM;
+                       ret = EPOLLIN|EPOLLRDNORM;
        }
        logbuf_unlock_irq();