Merge tag 'drm-next-2019-01-05' of git://anongit.freedesktop.org/drm/drm

[sfrench/cifs-2.6.git] / fs / proc_namespace.c

diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index c8528d587e09d3e856a39c848b998add4a29d7ed..e16fb8f2049e76dafdd533158fa534dc321d6dbc 100644 (file)
--- a/fs/proc_namespace.c
+++ b/fs/proc_namespace.c
@@ -23,7 +23,7 @@ static __poll_t mounts_poll(struct file *file, poll_table *wait)
        struct seq_file *m = file->private_data;
        struct proc_mounts *p = m->private;
        struct mnt_namespace *ns = p->ns;
-       __poll_t res = POLLIN | POLLRDNORM;
+       __poll_t res = EPOLLIN | EPOLLRDNORM;
        int event;
 
        poll_wait(file, &p->ns->poll, wait);
@@ -31,7 +31,7 @@ static __poll_t mounts_poll(struct file *file, poll_table *wait)
        event = READ_ONCE(ns->event);
        if (m->poll_event != event) {
                m->poll_event = event;
-               res |= POLLERR | POLLPRI;
+               res |= EPOLLERR | EPOLLPRI;
        }
 
        return res;