297 files changed, 913 insertions, 913 deletions
diff --git a/arch/cris/arch-v10/drivers/gpio.c b/arch/cris/arch-v10/drivers/gpio.c
index a2986c60aaac..cd0e05d89d42 100644
--- a/arch/cris/arch-v10/drivers/gpio.c
+++ b/arch/cris/arch-v10/drivers/gpio.c
@@ -173,7 +173,7 @@ static __poll_t gpio_poll(struct file *file, poll_table *wait)
        if ((data & priv->highalarm) ||
            (~data & priv->lowalarm)) {
-                mask = POLLIN|POLLRDNORM;
+                mask = EPOLLIN|EPOLLRDNORM;
        }
 out:
diff --git a/arch/cris/arch-v10/drivers/sync_serial.c b/arch/cris/arch-v10/drivers/sync_serial.c
index 177843c64071..ed1a568a7217 100644
--- a/arch/cris/arch-v10/drivers/sync_serial.c
+++ b/arch/cris/arch-v10/drivers/sync_serial.c
@@ -666,16 +666,16 @@ static __poll_t sync_serial_poll(struct file *file, poll_table *wait)
        poll_wait(file, &port->in_wait_q, wait);
        /* Some room to write */
        if (port->out_count < OUT_BUFFER_SIZE)
-                mask |=  POLLOUT | POLLWRNORM;
+                mask |=  EPOLLOUT | EPOLLWRNORM;
        /* At least an inbufchunk of data */
        if (sync_data_avail(port) >= port->inbufchunk)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        DEBUGPOLL(if (mask != prev_mask)
                printk(KERN_DEBUG "sync_serial_poll: mask 0x%08X %s %s\n",
                        mask,
-                        mask & POLLOUT ? "POLLOUT" : "",
+                        mask & EPOLLOUT ? "POLLOUT" : "",
-                        mask & POLLIN ? "POLLIN" : "");
+                        mask & EPOLLIN ? "POLLIN" : "");
                prev_mask = mask;
        );
        return mask;
diff --git a/arch/cris/arch-v32/drivers/sync_serial.c b/arch/cris/arch-v32/drivers/sync_serial.c
index e20e0b9a3a5c..1b0ce8a8af16 100644
--- a/arch/cris/arch-v32/drivers/sync_serial.c
+++ b/arch/cris/arch-v32/drivers/sync_serial.c
@@ -574,24 +574,24 @@ static __poll_t sync_serial_poll(struct file *file, poll_table *wait)
        /* No active transfer, descriptors are available */
        if (port->output && !port->tr_running)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        /* Descriptor and buffer space available. */
        if (port->output &&
            port->active_tr_descr != port->catch_tr_descr &&
            port->out_buf_count < OUT_BUFFER_SIZE)
-                mask |=  POLLOUT | POLLWRNORM;
+                mask |=  EPOLLOUT | EPOLLWRNORM;
        /* At least an inbufchunk of data */
        if (port->input && sync_data_avail(port) >= port->inbufchunk)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        DEBUGPOLL(
        if (mask != prev_mask)
                pr_info("sync_serial_poll: mask 0x%08X %s %s\n",
                        mask,
-                        mask & POLLOUT ? "POLLOUT" : "",
+                        mask & EPOLLOUT ? "POLLOUT" : "",
-                        mask & POLLIN ? "POLLIN" : "");
+                        mask & EPOLLIN ? "POLLIN" : "");
                prev_mask = mask;
        );
        return mask;
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index 858602494096..8fb280e33114 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -1670,7 +1670,7 @@ pfm_poll(struct file *filp, poll_table * wait)
        PROTECT_CTX(ctx, flags);
        if (PFM_CTXQ_EMPTY(ctx) == 0)
-                mask =  POLLIN | POLLRDNORM;
+                mask =  EPOLLIN | EPOLLRDNORM;
        UNPROTECT_CTX(ctx, flags);
diff --git a/arch/mips/kernel/rtlx.c b/arch/mips/kernel/rtlx.c
index bbb0f4770c0d..18c509c59f33 100644
--- a/arch/mips/kernel/rtlx.c
+++ b/arch/mips/kernel/rtlx.c
@@ -349,11 +349,11 @@ static __poll_t file_poll(struct file *file, poll_table *wait)
        /* data available to read? */
        if (rtlx_read_poll(minor, 0))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* space to write */
        if (rtlx_write_poll(minor))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index fc600a8b1e77..f915db93cd42 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -392,7 +392,7 @@ static __poll_t rtas_log_poll(struct file *file, poll_table * wait)
 {
        poll_wait(file, &rtas_log_wait, wait);
        if (rtas_log_size)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/arch/powerpc/platforms/cell/spufs/backing_ops.c b/arch/powerpc/platforms/cell/spufs/backing_ops.c
index 1a9a756b0b2f..857580a78bbd 100644
--- a/arch/powerpc/platforms/cell/spufs/backing_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/backing_ops.c
@@ -101,9 +101,9 @@ static __poll_t spu_backing_mbox_stat_poll(struct spu_context *ctx,
           but first mark any pending interrupts as done so
           we don't get woken up unnecessarily */
-        if (events & (POLLIN | POLLRDNORM)) {
+        if (events & (EPOLLIN | EPOLLRDNORM)) {
                if (stat & 0xff0000)
-                        ret |= POLLIN | POLLRDNORM;
+                        ret |= EPOLLIN | EPOLLRDNORM;
                else {
                        ctx->csa.priv1.int_stat_class2_RW &=
                                ~CLASS2_MAILBOX_INTR;
@@ -111,9 +111,9 @@ static __poll_t spu_backing_mbox_stat_poll(struct spu_context *ctx,
                                CLASS2_ENABLE_MAILBOX_INTR;
                }
        }
-        if (events & (POLLOUT | POLLWRNORM)) {
+        if (events & (EPOLLOUT | EPOLLWRNORM)) {
                if (stat & 0x00ff00)
-                        ret = POLLOUT | POLLWRNORM;
+                        ret = EPOLLOUT | EPOLLWRNORM;
                else {
                        ctx->csa.priv1.int_stat_class2_RW &=
                                ~CLASS2_MAILBOX_THRESHOLD_INTR;
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index c1be486da899..469bdd0b748f 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -774,7 +774,7 @@ static __poll_t spufs_ibox_poll(struct file *file, poll_table *wait)
         * that poll should not sleep.  Will be fixed later.
         */
        mutex_lock(&ctx->state_mutex);
-        mask = ctx->ops->mbox_stat_poll(ctx, POLLIN | POLLRDNORM);
+        mask = ctx->ops->mbox_stat_poll(ctx, EPOLLIN | EPOLLRDNORM);
        spu_release(ctx);
        return mask;
@@ -910,7 +910,7 @@ static __poll_t spufs_wbox_poll(struct file *file, poll_table *wait)
         * that poll should not sleep.  Will be fixed later.
         */
        mutex_lock(&ctx->state_mutex);
-        mask = ctx->ops->mbox_stat_poll(ctx, POLLOUT | POLLWRNORM);
+        mask = ctx->ops->mbox_stat_poll(ctx, EPOLLOUT | EPOLLWRNORM);
        spu_release(ctx);
        return mask;
@@ -1710,9 +1710,9 @@ static __poll_t spufs_mfc_poll(struct file *file,poll_table *wait)
        mask = 0;
        if (free_elements & 0xffff)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        if (tagstatus & ctx->tagwait)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        pr_debug("%s: free %d tagstatus %d tagwait %d\n", __func__,
                free_elements, tagstatus, ctx->tagwait);
@@ -2469,7 +2469,7 @@ static __poll_t spufs_switch_log_poll(struct file *file, poll_table *wait)
                return rc;
        if (spufs_switch_log_used(ctx) > 0)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        spu_release(ctx);
diff --git a/arch/powerpc/platforms/cell/spufs/hw_ops.c b/arch/powerpc/platforms/cell/spufs/hw_ops.c
index fff58198b5b6..ae9d24d31eed 100644
--- a/arch/powerpc/platforms/cell/spufs/hw_ops.c
+++ b/arch/powerpc/platforms/cell/spufs/hw_ops.c
@@ -70,17 +70,17 @@ static __poll_t spu_hw_mbox_stat_poll(struct spu_context *ctx, __poll_t events)
           but first mark any pending interrupts as done so
           we don't get woken up unnecessarily */
-        if (events & (POLLIN | POLLRDNORM)) {
+        if (events & (EPOLLIN | EPOLLRDNORM)) {
                if (stat & 0xff0000)
-                        ret |= POLLIN | POLLRDNORM;
+                        ret |= EPOLLIN | EPOLLRDNORM;
                else {
                        spu_int_stat_clear(spu, 2, CLASS2_MAILBOX_INTR);
                        spu_int_mask_or(spu, 2, CLASS2_ENABLE_MAILBOX_INTR);
                }
        }
-        if (events & (POLLOUT | POLLWRNORM)) {
+        if (events & (EPOLLOUT | EPOLLWRNORM)) {
                if (stat & 0x00ff00)
-                        ret = POLLOUT | POLLWRNORM;
+                        ret = EPOLLOUT | EPOLLWRNORM;
                else {
                        spu_int_stat_clear(spu, 2,
                                        CLASS2_MAILBOX_THRESHOLD_INTR);
diff --git a/arch/powerpc/platforms/powernv/opal-prd.c b/arch/powerpc/platforms/powernv/opal-prd.c
index c18de0a9b1bd..4070bb4e9da4 100644
--- a/arch/powerpc/platforms/powernv/opal-prd.c
+++ b/arch/powerpc/platforms/powernv/opal-prd.c
@@ -153,7 +153,7 @@ static __poll_t opal_prd_poll(struct file *file,
        poll_wait(file, &opal_prd_msg_wait, wait);
        if (!opal_msg_queue_empty())
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index dc0ca8e29c75..dfcbe6924eaf 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -1515,7 +1515,7 @@ static __poll_t do_poll(struct file *fp, poll_table *wait)
                return 0;
        poll_wait(fp, &apm_waitqueue, wait);
        if (!queue_empty(as))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/arch/x86/kernel/cpu/mcheck/dev-mcelog.c b/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
index 213e8c2ca702..97685a0c3175 100644
--- a/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
+++ b/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
@@ -247,9 +247,9 @@ static __poll_t mce_chrdev_poll(struct file *file, poll_table *wait)
 {
        poll_wait(file, &mce_chrdev_wait, wait);
        if (READ_ONCE(mcelog.next))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        if (!mce_apei_read_done && apei_check_mce())
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/block/bsg.c b/block/bsg.c
index 2e2c1e222209..06dc96e1f670 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -849,9 +849,9 @@ static __poll_t bsg_poll(struct file *file, poll_table *wait)
        spin_lock_irq(&bd->lock);
        if (!list_empty(&bd->done_list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (bd->queued_cmds < bd->max_queue)
-                mask |= POLLOUT;
+                mask |= EPOLLOUT;
        spin_unlock_irq(&bd->lock);
        return mask;
diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index 0f8d8d5523c3..c49766b03165 100644
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -735,9 +735,9 @@ void af_alg_wmem_wakeup(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLIN |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN |
-                                                           POLLRDNORM |
+                                                           EPOLLRDNORM |
-                                                           POLLRDBAND);
+                                                           EPOLLRDBAND);
        sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
        rcu_read_unlock();
 }
@@ -800,9 +800,9 @@ void af_alg_data_wakeup(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLOUT |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLOUT |
-                                                           POLLRDNORM |
+                                                           EPOLLRDNORM |
-                                                           POLLRDBAND);
+                                                           EPOLLRDBAND);
        sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
        rcu_read_unlock();
 }
@@ -1076,10 +1076,10 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock,
        mask = 0;
        if (!ctx->more || ctx->used)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (af_alg_writable(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        return mask;
 }
diff --git a/drivers/acpi/acpi_dbg.c b/drivers/acpi/acpi_dbg.c
index 2ff5c8c04e3b..f21c99ec46ee 100644
--- a/drivers/acpi/acpi_dbg.c
+++ b/drivers/acpi/acpi_dbg.c
@@ -724,9 +724,9 @@ static __poll_t acpi_aml_poll(struct file *file, poll_table *wait)
        poll_wait(file, &acpi_aml_io.wait, wait);
        if (acpi_aml_user_readable())
-                masks |= POLLIN | POLLRDNORM;
+                masks |= EPOLLIN | EPOLLRDNORM;
        if (acpi_aml_user_writable())
-                masks |= POLLOUT | POLLWRNORM;
+                masks |= EPOLLOUT | EPOLLWRNORM;
        return masks;
 }
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index d21040c5d343..15e3d3c2260d 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -4371,7 +4371,7 @@ static int binder_thread_release(struct binder_proc *proc,
         */
        if ((thread->looper & BINDER_LOOPER_STATE_POLL) &&
            waitqueue_active(&thread->wait)) {
-                wake_up_poll(&thread->wait, POLLHUP | POLLFREE);
+                wake_up_poll(&thread->wait, EPOLLHUP | POLLFREE);
        }
        binder_inner_proc_unlock(thread->proc);
@@ -4401,7 +4401,7 @@ static __poll_t binder_poll(struct file *filp,
        poll_wait(filp, &thread->wait, wait);
        if (binder_has_work(thread, wait_for_proc_work))
-                return POLLIN;
+                return EPOLLIN;
        return 0;
 }
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 0521748a1972..22f9145a426f 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -306,9 +306,9 @@ static __poll_t vhci_poll(struct file *file, poll_table *wait)
        poll_wait(file, &data->read_wait, wait);
        if (!skb_queue_empty(&data->readq))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
-        return POLLOUT | POLLWRNORM;
+        return EPOLLOUT | EPOLLWRNORM;
 }
 static void vhci_open_timeout(struct work_struct *work)
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index a2a1c1478cd0..a5e2f9e557ea 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -241,7 +241,7 @@ static __poll_t apm_poll(struct file *fp, poll_table * wait)
        struct apm_user *as = fp->private_data;
        poll_wait(fp, &apm_waitqueue, wait);
-        return queue_empty(&as->queue) ? 0 : POLLIN | POLLRDNORM;
+        return queue_empty(&as->queue) ? 0 : EPOLLIN | EPOLLRDNORM;
 }
 /*
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c
index 2f92cc46698b..06749e295ada 100644
--- a/drivers/char/dsp56k.c
+++ b/drivers/char/dsp56k.c
@@ -414,7 +414,7 @@ static __poll_t dsp56k_poll(struct file *file, poll_table *wait)
        {
        case DSP56K_DEV_56001:
                /* poll_wait(file, ???, wait); */
-                return POLLIN | POLLRDNORM | POLLOUT;
+                return EPOLLIN | EPOLLRDNORM | EPOLLOUT;
        default:
                printk("DSP56k driver: Unknown minor device: %d\n", dev);
diff --git a/drivers/char/dtlk.c b/drivers/char/dtlk.c
index 2697c22e3be2..f882460b5a44 100644
--- a/drivers/char/dtlk.c
+++ b/drivers/char/dtlk.c
@@ -62,7 +62,7 @@
 #include <linux/uaccess.h>      /* for get_user, etc. */
 #include <linux/wait.h>         /* for wait_queue */
 #include <linux/init.h>         /* for __init, module_{init,exit} */
-#include <linux/poll.h>         /* for POLLIN, etc. */
+#include <linux/poll.h>         /* for EPOLLIN, etc. */
 #include <linux/dtlk.h>         /* local header file for DoubleTalk values */
 #ifdef TRACING
@@ -244,11 +244,11 @@ static __poll_t dtlk_poll(struct file *file, poll_table * wait)
        if (dtlk_has_indexing && dtlk_readable()) {
                del_timer(&dtlk_timer);
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        }
        if (dtlk_writeable()) {
                del_timer(&dtlk_timer);
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        }
        /* there are no exception conditions */
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index dbed4953f86c..be426eb2a353 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -359,7 +359,7 @@ static __poll_t hpet_poll(struct file *file, poll_table * wait)
        spin_unlock_irq(&hpet_lock);
        if (v != 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/char/ipmi/bt-bmc.c b/drivers/char/ipmi/bt-bmc.c
index 7992c870b0a2..c95b93b7598b 100644
--- a/drivers/char/ipmi/bt-bmc.c
+++ b/drivers/char/ipmi/bt-bmc.c
@@ -349,10 +349,10 @@ static __poll_t bt_bmc_poll(struct file *file, poll_table *wait)
        ctrl = bt_inb(bt_bmc, BT_CTRL);
        if (ctrl & BT_CTRL_H2B_ATN)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        if (!(ctrl & (BT_CTRL_H_BUSY | BT_CTRL_B2H_ATN)))
-                mask |= POLLOUT;
+                mask |= EPOLLOUT;
        return mask;
 }
diff --git a/drivers/char/ipmi/ipmi_devintf.c b/drivers/char/ipmi/ipmi_devintf.c
index a011a7739f5e..5f1bc9174735 100644
--- a/drivers/char/ipmi/ipmi_devintf.c
+++ b/drivers/char/ipmi/ipmi_devintf.c
@@ -89,7 +89,7 @@ static __poll_t ipmi_poll(struct file *file, poll_table *wait)
        spin_lock_irqsave(&priv->recv_msg_lock, flags);
        if (!list_empty(&(priv->recv_msgs)))
-                mask |= (POLLIN | POLLRDNORM);
+                mask |= (EPOLLIN | EPOLLRDNORM);
        spin_unlock_irqrestore(&priv->recv_msg_lock, flags);
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index 34bc1f3ca414..a58acdcf7414 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -895,7 +895,7 @@ static __poll_t ipmi_poll(struct file *file, poll_table *wait)
        spin_lock(&ipmi_read_lock);
        if (data_to_read)
-                mask |= (POLLIN | POLLRDNORM);
+                mask |= (EPOLLIN | EPOLLRDNORM);
        spin_unlock(&ipmi_read_lock);
        return mask;
diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 819fe37a3683..f80965407d3c 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -423,9 +423,9 @@ static __poll_t cm4040_poll(struct file *filp, poll_table *wait)
        poll_wait(filp, &dev->poll_wait, wait);
        if (test_and_clear_bit(BS_READABLE, &dev->buffer_status))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (test_and_clear_bit(BS_WRITABLE, &dev->buffer_status))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        DEBUGP(2, dev, "<- cm4040_poll(%u)\n", mask);
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 7a56d1a13ec3..1ae77b41050a 100644
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -776,7 +776,7 @@ static __poll_t pp_poll(struct file *file, poll_table *wait)
        poll_wait(file, &pp->irq_wait, wait);
        if (atomic_read(&pp->irqc))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 80f2c326db47..e5b3d3ba4660 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1793,9 +1793,9 @@ random_poll(struct file *file, poll_table * wait)
        poll_wait(file, &random_write_wait, wait);
        mask = 0;
        if (ENTROPY_BITS(&input_pool) >= random_read_wakeup_bits)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (ENTROPY_BITS(&input_pool) < random_write_wakeup_bits)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index c6a317120a55..0c858d027bf3 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -804,7 +804,7 @@ static __poll_t rtc_poll(struct file *file, poll_table *wait)
        spin_unlock_irq(&rtc_lock);
        if (l != 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
 #endif
diff --git a/drivers/char/snsc.c b/drivers/char/snsc.c
index 7f49fa0f41d7..5918ea7499bb 100644
--- a/drivers/char/snsc.c
+++ b/drivers/char/snsc.c
@@ -340,10 +340,10 @@ scdrv_poll(struct file *file, struct poll_table_struct *wait)
        if (status > 0) {
                if (status & SAL_IROUTER_INTR_RECV) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                }
                if (status & SAL_IROUTER_INTR_XMIT) {
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
                }
        }
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index fc041c462aa4..186689833231 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -944,7 +944,7 @@ static __poll_t sonypi_misc_poll(struct file *file, poll_table *wait)
 {
        poll_wait(file, &sonypi_device.fifo_proc_list, wait);
        if (kfifo_len(&sonypi_device.fifo))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c
index 674218b50b13..e4f79f920450 100644
--- a/drivers/char/tpm/tpm_vtpm_proxy.c
+++ b/drivers/char/tpm/tpm_vtpm_proxy.c
@@ -180,15 +180,15 @@ static __poll_t vtpm_proxy_fops_poll(struct file *filp, poll_table *wait)
        poll_wait(filp, &proxy_dev->wq, wait);
-        ret = POLLOUT;
+        ret = EPOLLOUT;
        mutex_lock(&proxy_dev->buf_lock);
        if (proxy_dev->req_len)
-                ret |= POLLIN | POLLRDNORM;
+                ret |= EPOLLIN | EPOLLRDNORM;
        if (!(proxy_dev->state & STATE_OPENED_FLAG))
-                ret |= POLLHUP;
+                ret |= EPOLLHUP;
        mutex_unlock(&proxy_dev->buf_lock);
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 813a2e46824d..468f06134012 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -992,15 +992,15 @@ static __poll_t port_fops_poll(struct file *filp, poll_table *wait)
        if (!port->guest_connected) {
                /* Port got unplugged */
-                return POLLHUP;
+                return EPOLLHUP;
        }
        ret = 0;
        if (!will_read_block(port))
-                ret |= POLLIN | POLLRDNORM;
+                ret |= EPOLLIN | EPOLLRDNORM;
        if (!will_write_block(port))
-                ret |= POLLOUT;
+                ret |= EPOLLOUT;
        if (!port->host_connected)
-                ret |= POLLHUP;
+                ret |= EPOLLHUP;
        return ret;
 }
diff --git a/drivers/char/xillybus/xillybus_core.c b/drivers/char/xillybus/xillybus_core.c
index 88e1cf475d3f..a11af94e2e65 100644
--- a/drivers/char/xillybus/xillybus_core.c
+++ b/drivers/char/xillybus/xillybus_core.c
@@ -1758,15 +1758,15 @@ static __poll_t xillybus_poll(struct file *filp, poll_table *wait)
                spin_lock_irqsave(&channel->wr_spinlock, flags);
                if (!channel->wr_empty || channel->wr_ready)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                if (channel->wr_hangup)
                        /*
-                         * Not POLLHUP, because its behavior is in the
+                         * Not EPOLLHUP, because its behavior is in the
-                         * mist, and POLLIN does what we want: Wake up
+                         * mist, and EPOLLIN does what we want: Wake up
                         * the read file descriptor so it sees EOF.
                         */
-                        mask |=  POLLIN | POLLRDNORM;
+                        mask |=  EPOLLIN | EPOLLRDNORM;
                spin_unlock_irqrestore(&channel->wr_spinlock, flags);
        }
@@ -1781,12 +1781,12 @@ static __poll_t xillybus_poll(struct file *filp, poll_table *wait)
                spin_lock_irqsave(&channel->rd_spinlock, flags);
                if (!channel->rd_full)
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
                spin_unlock_irqrestore(&channel->rd_spinlock, flags);
        }
        if (channel->endpoint->fatal_error)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        return mask;
 }
diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index 539450713838..d78d5fc173dc 100644
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -135,10 +135,10 @@ static loff_t dma_buf_llseek(struct file *file, loff_t offset, int whence)
 * Userspace can query the state of these implicitly tracked fences using poll()
 * and related system calls:
 *
- * - Checking for POLLIN, i.e. read access, can be use to query the state of the
+ * - Checking for EPOLLIN, i.e. read access, can be use to query the state of the
 *   most recent write or exclusive fence.
 *
- * - Checking for POLLOUT, i.e. write access, can be used to query the state of
+ * - Checking for EPOLLOUT, i.e. write access, can be used to query the state of
 *   all attached fences, shared and exclusive ones.
 *
 * Note that this only signals the completion of the respective fences, i.e. the
@@ -168,13 +168,13 @@ static __poll_t dma_buf_poll(struct file *file, poll_table *poll)
        dmabuf = file->private_data;
        if (!dmabuf || !dmabuf->resv)
-                return POLLERR;
+                return EPOLLERR;
        resv = dmabuf->resv;
        poll_wait(file, &dmabuf->poll, poll);
-        events = poll_requested_events(poll) & (POLLIN | POLLOUT);
+        events = poll_requested_events(poll) & (EPOLLIN | EPOLLOUT);
        if (!events)
                return 0;
@@ -193,12 +193,12 @@ retry:
                goto retry;
        }
-        if (fence_excl && (!(events & POLLOUT) || shared_count == 0)) {
+        if (fence_excl && (!(events & EPOLLOUT) || shared_count == 0)) {
                struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_excl;
-                __poll_t pevents = POLLIN;
+                __poll_t pevents = EPOLLIN;
                if (shared_count == 0)
-                        pevents |= POLLOUT;
+                        pevents |= EPOLLOUT;
                spin_lock_irq(&dmabuf->poll.lock);
                if (dcb->active) {
@@ -228,19 +228,19 @@ retry:
                }
        }
-        if ((events & POLLOUT) && shared_count > 0) {
+        if ((events & EPOLLOUT) && shared_count > 0) {
                struct dma_buf_poll_cb_t *dcb = &dmabuf->cb_shared;
                int i;
                /* Only queue a new callback if no event has fired yet */
                spin_lock_irq(&dmabuf->poll.lock);
                if (dcb->active)
-                        events &= ~POLLOUT;
+                        events &= ~EPOLLOUT;
                else
-                        dcb->active = POLLOUT;
+                        dcb->active = EPOLLOUT;
                spin_unlock_irq(&dmabuf->poll.lock);
-                if (!(events & POLLOUT))
+                if (!(events & EPOLLOUT))
                        goto out;
                for (i = 0; i < shared_count; ++i) {
@@ -253,14 +253,14 @@ retry:
                                 *
                                 * call dma_buf_poll_cb and force a recheck!
                                 */
-                                events &= ~POLLOUT;
+                                events &= ~EPOLLOUT;
                                dma_buf_poll_cb(NULL, &dcb->cb);
                                break;
                        }
                        if (!dma_fence_add_callback(fence, &dcb->cb,
                                                    dma_buf_poll_cb)) {
                                dma_fence_put(fence);
-                                events &= ~POLLOUT;
+                                events &= ~EPOLLOUT;
                                break;
                        }
                        dma_fence_put(fence);
diff --git a/drivers/dma-buf/sync_file.c b/drivers/dma-buf/sync_file.c
index 8e8c4a12a0bc..35dd06479867 100644
--- a/drivers/dma-buf/sync_file.c
+++ b/drivers/dma-buf/sync_file.c
@@ -325,7 +325,7 @@ static __poll_t sync_file_poll(struct file *file, poll_table *wait)
                        wake_up_all(&sync_file->wq);
        }
-        return dma_fence_is_signaled(sync_file->fence) ? POLLIN : 0;
+        return dma_fence_is_signaled(sync_file->fence) ? EPOLLIN : 0;
 }
 static long sync_file_ioctl_merge(struct sync_file *sync_file,
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 523391bb3fbe..f0587273940e 100644
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1792,9 +1792,9 @@ static __poll_t fw_device_op_poll(struct file *file, poll_table * pt)
        poll_wait(file, &client->wait, pt);
        if (fw_device_is_shutdown(client->device))
-                mask |= POLLHUP | POLLERR;
+                mask |= EPOLLHUP | EPOLLERR;
        if (!list_empty(&client->event_list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/firewire/nosy.c b/drivers/firewire/nosy.c
index fee2e9e7ea20..a128dd1126ae 100644
--- a/drivers/firewire/nosy.c
+++ b/drivers/firewire/nosy.c
@@ -337,10 +337,10 @@ nosy_poll(struct file *file, poll_table *pt)
        poll_wait(file, &client->buffer.wait, pt);
        if (atomic_read(&client->buffer.size) > 0)
-                ret = POLLIN | POLLRDNORM;
+                ret = EPOLLIN | EPOLLRDNORM;
        if (list_empty(&client->lynx->link))
-                ret |= POLLHUP;
+                ret |= EPOLLHUP;
        return ret;
 }
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
index 36ca5064486e..d66de67ef307 100644
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@ -630,7 +630,7 @@ static __poll_t lineevent_poll(struct file *filep,
        poll_wait(filep, &le->wait, wait);
        if (!kfifo_is_empty(&le->events))
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        return events;
 }
@@ -775,7 +775,7 @@ static irqreturn_t lineevent_irq_thread(int irq, void *p)
        ret = kfifo_put(&le->events, ge);
        if (ret != 0)
-                wake_up_poll(&le->wait, POLLIN);
+                wake_up_poll(&le->wait, EPOLLIN);
        return IRQ_HANDLED;
 }
diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c
index 9a17bd3639d1..e394799979a6 100644
--- a/drivers/gpu/drm/drm_file.c
+++ b/drivers/gpu/drm/drm_file.c
@@ -567,7 +567,7 @@ __poll_t drm_poll(struct file *filp, struct poll_table_struct *wait)
        poll_wait(filp, &file_priv->event_wait, wait);
        if (!list_empty(&file_priv->event_list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index e42d9a4de322..0be50e43507d 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -244,7 +244,7 @@
 * The two separate pointers let us decouple read()s from tail pointer aging.
 *
 * The tail pointers are checked and updated at a limited rate within a hrtimer
- * callback (the same callback that is used for delivering POLLIN events)
+ * callback (the same callback that is used for delivering EPOLLIN events)
 *
 * Initially the tails are marked invalid with %INVALID_TAIL_PTR which
 * indicates that an updated tail pointer is needed.
@@ -2292,13 +2292,13 @@ static ssize_t i915_perf_read(struct file *file,
                mutex_unlock(&dev_priv->perf.lock);
        }
-        /* We allow the poll checking to sometimes report false positive POLLIN
+        /* We allow the poll checking to sometimes report false positive EPOLLIN
         * events where we might actually report EAGAIN on read() if there's
         * not really any data available. In this situation though we don't
-         * want to enter a busy loop between poll() reporting a POLLIN event
+         * want to enter a busy loop between poll() reporting a EPOLLIN event
         * and read() returning -EAGAIN. Clearing the oa.pollin state here
         * effectively ensures we back off until the next hrtimer callback
-         * before reporting another POLLIN event.
+         * before reporting another EPOLLIN event.
         */
        if (ret >= 0 || ret == -EAGAIN) {
                /* Maybe make ->pollin per-stream state if we support multiple
@@ -2358,7 +2358,7 @@ static __poll_t i915_perf_poll_locked(struct drm_i915_private *dev_priv,
         * samples to read.
         */
        if (dev_priv->perf.oa.pollin)
-                events |= POLLIN;
+                events |= EPOLLIN;
        return events;
 }
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index dfd8d0048980..1c5e74cb9279 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1271,7 +1271,7 @@ static __poll_t vga_arb_fpoll(struct file *file, poll_table *wait)
        pr_debug("%s\n", __func__);
        poll_wait(file, &vga_wait_queue, wait);
-        return POLLIN;
+        return EPOLLIN;
 }
 static int vga_arb_open(struct inode *inode, struct file *file)
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
index c783fd5ef809..4f4e7a08a07b 100644
--- a/drivers/hid/hid-debug.c
+++ b/drivers/hid/hid-debug.c
@@ -1185,9 +1185,9 @@ static __poll_t hid_debug_events_poll(struct file *file, poll_table *wait)
        poll_wait(file, &list->hdev->debug_wait, wait);
        if (list->head != list->tail)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        if (!list->hdev->debug)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        return 0;
 }
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c
index b7e86aba6f33..5be8de70c651 100644
--- a/drivers/hid/hid-roccat.c
+++ b/drivers/hid/hid-roccat.c
@@ -142,9 +142,9 @@ static __poll_t roccat_poll(struct file *file, poll_table *wait)
        struct roccat_reader *reader = file->private_data;
        poll_wait(file, &reader->device->wait, wait);
        if (reader->cbuf_start != reader->device->cbuf_end)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        if (!reader->device->exist)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        return 0;
 }
diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
index 21ed6c55c40a..e8a114157f87 100644
--- a/drivers/hid/hid-sensor-custom.c
+++ b/drivers/hid/hid-sensor-custom.c
@@ -714,7 +714,7 @@ static __poll_t hid_sensor_custom_poll(struct file *file,
        poll_wait(file, &sensor_inst->wait, wait);
        if (!kfifo_is_empty(&sensor_inst->data_fifo))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
index be210219f982..fbfcc8009432 100644
--- a/drivers/hid/hidraw.c
+++ b/drivers/hid/hidraw.c
@@ -255,9 +255,9 @@ static __poll_t hidraw_poll(struct file *file, poll_table *wait)
        poll_wait(file, &list->hidraw->wait, wait);
        if (list->head != list->tail)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        if (!list->hidraw->exist)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        return 0;
 }
diff --git a/drivers/hid/uhid.c b/drivers/hid/uhid.c
index fc43850a155e..4e0e7baf8513 100644
--- a/drivers/hid/uhid.c
+++ b/drivers/hid/uhid.c
@@ -760,7 +760,7 @@ static __poll_t uhid_char_poll(struct file *file, poll_table *wait)
        poll_wait(file, &uhid->waitq, wait);
        if (uhid->head != uhid->tail)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/hid/usbhid/hiddev.c b/drivers/hid/usbhid/hiddev.c
index 0ff3e7e70c8d..e3ce233f8bdc 100644
--- a/drivers/hid/usbhid/hiddev.c
+++ b/drivers/hid/usbhid/hiddev.c
@@ -428,9 +428,9 @@ static __poll_t hiddev_poll(struct file *file, poll_table *wait)
        poll_wait(file, &list->hiddev->wait, wait);
        if (list->head != list->tail)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        if (!list->hiddev->exist)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        return 0;
 }
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 8fbbacb0fe21..324cb8ec9405 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -1132,9 +1132,9 @@ static __poll_t cs_char_poll(struct file *file, poll_table *wait)
        poll_wait(file, &cs_char_data.wait, wait);
        spin_lock_bh(&csdata->lock);
        if (!list_empty(&csdata->chardev_queue))
-                ret = POLLIN | POLLRDNORM;
+                ret = EPOLLIN | EPOLLRDNORM;
        else if (!list_empty(&csdata->dataind_queue))
-                ret = POLLIN | POLLRDNORM;
+                ret = EPOLLIN | EPOLLRDNORM;
        spin_unlock_bh(&csdata->lock);
        return ret;
diff --git a/drivers/hv/hv_utils_transport.c b/drivers/hv/hv_utils_transport.c
index 047959e74bb1..832777527936 100644
--- a/drivers/hv/hv_utils_transport.c
+++ b/drivers/hv/hv_utils_transport.c
@@ -113,10 +113,10 @@ static __poll_t hvt_op_poll(struct file *file, poll_table *wait)
        poll_wait(file, &hvt->outmsg_q, wait);
        if (hvt->mode == HVUTIL_TRANSPORT_DESTROY)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        if (hvt->outmsg_len > 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/iio/buffer/industrialio-buffer-dma.c b/drivers/iio/buffer/industrialio-buffer-dma.c
index ff03324dee13..05e0c353e089 100644
--- a/drivers/iio/buffer/industrialio-buffer-dma.c
+++ b/drivers/iio/buffer/industrialio-buffer-dma.c
@@ -222,7 +222,7 @@ void iio_dma_buffer_block_done(struct iio_dma_buffer_block *block)
        spin_unlock_irqrestore(&queue->list_lock, flags);
        iio_buffer_block_put_atomic(block);
-        wake_up_interruptible_poll(&queue->buffer.pollq, POLLIN | POLLRDNORM);
+        wake_up_interruptible_poll(&queue->buffer.pollq, EPOLLIN | EPOLLRDNORM);
 }
 EXPORT_SYMBOL_GPL(iio_dma_buffer_block_done);
@@ -251,7 +251,7 @@ void iio_dma_buffer_block_list_abort(struct iio_dma_buffer_queue *queue,
        }
        spin_unlock_irqrestore(&queue->list_lock, flags);
-        wake_up_interruptible_poll(&queue->buffer.pollq, POLLIN | POLLRDNORM);
+        wake_up_interruptible_poll(&queue->buffer.pollq, EPOLLIN | EPOLLRDNORM);
 }
 EXPORT_SYMBOL_GPL(iio_dma_buffer_block_list_abort);
diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 6184c100a94a..79abf70a126d 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -166,7 +166,7 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf,
 * @wait:       Poll table structure pointer for which the driver adds
 *              a wait queue
 *
- * Return: (POLLIN | POLLRDNORM) if data is available for reading
+ * Return: (EPOLLIN | EPOLLRDNORM) if data is available for reading
 *         or 0 for other cases
 */
 __poll_t iio_buffer_poll(struct file *filp,
@@ -180,7 +180,7 @@ __poll_t iio_buffer_poll(struct file *filp,
        poll_wait(filp, &rb->pollq, wait);
        if (iio_buffer_ready(indio_dev, rb, rb->watermark, 0))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
@@ -1396,7 +1396,7 @@ static int iio_push_to_buffer(struct iio_buffer *buffer, const void *data)
         * We can't just test for watermark to decide if we wake the poll queue
         * because read may request less samples than the watermark.
         */
-        wake_up_interruptible_poll(&buffer->pollq, POLLIN | POLLRDNORM);
+        wake_up_interruptible_poll(&buffer->pollq, EPOLLIN | EPOLLRDNORM);
        return 0;
 }
diff --git a/drivers/iio/industrialio-event.c b/drivers/iio/industrialio-event.c
index 0bcf073e46db..c6dfdf0aaac5 100644
--- a/drivers/iio/industrialio-event.c
+++ b/drivers/iio/industrialio-event.c
@@ -80,7 +80,7 @@ int iio_push_event(struct iio_dev *indio_dev, u64 ev_code, s64 timestamp)
                copied = kfifo_put(&ev_int->det_events, ev);
                if (copied != 0)
-                        wake_up_poll(&ev_int->wait, POLLIN);
+                        wake_up_poll(&ev_int->wait, EPOLLIN);
        }
        return 0;
@@ -92,7 +92,7 @@ EXPORT_SYMBOL(iio_push_event);
 * @filep:      File structure pointer to identify the device
 * @wait:       Poll table pointer to add the wait queue on
 *
- * Return: (POLLIN | POLLRDNORM) if data is available for reading
+ * Return: (EPOLLIN | EPOLLRDNORM) if data is available for reading
 *         or a negative error code on failure
 */
 static __poll_t iio_event_poll(struct file *filep,
@@ -108,7 +108,7 @@ static __poll_t iio_event_poll(struct file *filep,
        poll_wait(filep, &ev_int->wait, wait);
        if (!kfifo_is_empty(&ev_int->det_events))
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        return events;
 }
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index 8ae636bb09e5..01702265c1e1 100644
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1144,7 +1144,7 @@ static __poll_t ib_ucm_poll(struct file *filp,
        poll_wait(filp, &file->poll_wait, wait);
        if (!list_empty(&file->events))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 6ba4231f2b07..f015f1bf88c9 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -1639,7 +1639,7 @@ static __poll_t ucma_poll(struct file *filp, struct poll_table_struct *wait)
        poll_wait(filp, &file->poll_wait, wait);
        if (!list_empty(&file->event_list))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 78c77962422e..bb98c9e4a7fd 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -633,12 +633,12 @@ static __poll_t ib_umad_poll(struct file *filp, struct poll_table_struct *wait)
        struct ib_umad_file *file = filp->private_data;
        /* we will always be able to post a MAD send */
-        __poll_t mask = POLLOUT | POLLWRNORM;
+        __poll_t mask = EPOLLOUT | EPOLLWRNORM;
        poll_wait(filp, &file->recv_wait, wait);
        if (!list_empty(&file->recv_list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 5b811bf574d6..395a3b091229 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -351,7 +351,7 @@ static __poll_t ib_uverbs_event_poll(struct ib_uverbs_event_queue *ev_queue,
        spin_lock_irq(&ev_queue->lock);
        if (!list_empty(&ev_queue->event_list))
-                pollflags = POLLIN | POLLRDNORM;
+                pollflags = EPOLLIN | EPOLLRDNORM;
        spin_unlock_irq(&ev_queue->lock);
        return pollflags;
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c
index d9a0f2590294..41fafebe3b0d 100644
--- a/drivers/infiniband/hw/hfi1/file_ops.c
+++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -612,13 +612,13 @@ static __poll_t hfi1_poll(struct file *fp, struct poll_table_struct *pt)
        uctxt = ((struct hfi1_filedata *)fp->private_data)->uctxt;
        if (!uctxt)
-                pollflag = POLLERR;
+                pollflag = EPOLLERR;
        else if (uctxt->poll_type == HFI1_POLL_TYPE_URGENT)
                pollflag = poll_urgent(fp, pt);
        else  if (uctxt->poll_type == HFI1_POLL_TYPE_ANYRCV)
                pollflag = poll_next(fp, pt);
        else /* invalid */
-                pollflag = POLLERR;
+                pollflag = EPOLLERR;
        return pollflag;
 }
@@ -1435,7 +1435,7 @@ static __poll_t poll_urgent(struct file *fp,
        spin_lock_irq(&dd->uctxt_lock);
        if (uctxt->urgent != uctxt->urgent_poll) {
-                pollflag = POLLIN | POLLRDNORM;
+                pollflag = EPOLLIN | EPOLLRDNORM;
                uctxt->urgent_poll = uctxt->urgent;
        } else {
                pollflag = 0;
@@ -1462,7 +1462,7 @@ static __poll_t poll_next(struct file *fp,
                hfi1_rcvctrl(dd, HFI1_RCVCTRL_INTRAVAIL_ENB, uctxt);
                pollflag = 0;
        } else {
-                pollflag = POLLIN | POLLRDNORM;
+                pollflag = EPOLLIN | EPOLLRDNORM;
        }
        spin_unlock_irq(&dd->uctxt_lock);
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index f7593b5e2b76..52c29db3a2f4 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1085,7 +1085,7 @@ static __poll_t qib_poll_urgent(struct qib_ctxtdata *rcd,
        spin_lock_irq(&dd->uctxt_lock);
        if (rcd->urgent != rcd->urgent_poll) {
-                pollflag = POLLIN | POLLRDNORM;
+                pollflag = EPOLLIN | EPOLLRDNORM;
                rcd->urgent_poll = rcd->urgent;
        } else {
                pollflag = 0;
@@ -1111,7 +1111,7 @@ static __poll_t qib_poll_next(struct qib_ctxtdata *rcd,
                dd->f_rcvctrl(rcd->ppd, QIB_RCVCTRL_INTRAVAIL_ENB, rcd->ctxt);
                pollflag = 0;
        } else
-                pollflag = POLLIN | POLLRDNORM;
+                pollflag = EPOLLIN | EPOLLRDNORM;
        spin_unlock_irq(&dd->uctxt_lock);
        return pollflag;
@@ -1124,13 +1124,13 @@ static __poll_t qib_poll(struct file *fp, struct poll_table_struct *pt)
        rcd = ctxt_fp(fp);
        if (!rcd)
-                pollflag = POLLERR;
+                pollflag = EPOLLERR;
        else if (rcd->poll_type == QIB_POLL_TYPE_URGENT)
                pollflag = qib_poll_urgent(rcd, fp, pt);
        else  if (rcd->poll_type == QIB_POLL_TYPE_ANYRCV)
                pollflag = qib_poll_next(rcd, fp, pt);
        else /* invalid */
-                pollflag = POLLERR;
+                pollflag = EPOLLERR;
        return pollflag;
 }
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c
index 19624e023ebd..0336643c2ed6 100644
--- a/drivers/infiniband/ulp/iser/iscsi_iser.c
+++ b/drivers/infiniband/ulp/iser/iscsi_iser.c
@@ -874,7 +874,7 @@ iscsi_iser_ep_poll(struct iscsi_endpoint *ep, int timeout_ms)
        iser_info("iser conn %p rc = %d\n", iser_conn, rc);
        if (rc > 0)
-                return 1; /* success, this is the equivalent of POLLOUT */
+                return 1; /* success, this is the equivalent of EPOLLOUT */
        else if (!rc)
                return 0; /* timeout */
        else
diff --git a/drivers/input/evdev.c b/drivers/input/evdev.c
index 94049fdc583c..c81c79d01d93 100644
--- a/drivers/input/evdev.c
+++ b/drivers/input/evdev.c
@@ -650,12 +650,12 @@ static __poll_t evdev_poll(struct file *file, poll_table *wait)
        poll_wait(file, &evdev->wait, wait);
        if (evdev->exist && !client->revoked)
-                mask = POLLOUT | POLLWRNORM;
+                mask = EPOLLOUT | EPOLLWRNORM;
        else
-                mask = POLLHUP | POLLERR;
+                mask = EPOLLHUP | EPOLLERR;
        if (client->packet_head != client->tail)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/input/input.c b/drivers/input/input.c
index 0d0b2ab1bb6b..9785546420a7 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -1053,7 +1053,7 @@ static __poll_t input_proc_devices_poll(struct file *file, poll_table *wait)
        poll_wait(file, &input_devices_poll_wait, wait);
        if (file->f_version != input_devices_state) {
                file->f_version = input_devices_state;
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        }
        return 0;
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index fe3255572886..4c1e427dfabb 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -442,8 +442,8 @@ static __poll_t joydev_poll(struct file *file, poll_table *wait)
        struct joydev *joydev = client->joydev;
        poll_wait(file, &joydev->wait, wait);
-        return (joydev_data_pending(client) ? (POLLIN | POLLRDNORM) : 0) |
+        return (joydev_data_pending(client) ? (EPOLLIN | EPOLLRDNORM) : 0) |
-                (joydev->exist ?  0 : (POLLHUP | POLLERR));
+                (joydev->exist ?  0 : (EPOLLHUP | EPOLLERR));
 }
 static int joydev_handle_JSIOCSAXMAP(struct joydev *joydev,
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 9c3f7ec3bd3d..49b34de0aed4 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -414,7 +414,7 @@ static __poll_t hp_sdc_rtc_poll(struct file *file, poll_table *wait)
        l = 0;
        if (l != 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index f640c591ef23..96a887f33698 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -704,7 +704,7 @@ static __poll_t uinput_poll(struct file *file, poll_table *wait)
        poll_wait(file, &udev->waitq, wait);
        if (udev->head != udev->tail)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
index 731d84ae5101..e08228061bcd 100644
--- a/drivers/input/mousedev.c
+++ b/drivers/input/mousedev.c
@@ -765,9 +765,9 @@ static __poll_t mousedev_poll(struct file *file, poll_table *wait)
        poll_wait(file, &mousedev->wait, wait);
-        mask = mousedev->exist ? POLLOUT | POLLWRNORM : POLLHUP | POLLERR;
+        mask = mousedev->exist ? EPOLLOUT | EPOLLWRNORM : EPOLLHUP | EPOLLERR;
        if (client->ready || client->buffer)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index fccf55a380b2..17b7fbecd9fe 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -247,9 +247,9 @@ static __poll_t serio_raw_poll(struct file *file, poll_table *wait)
        poll_wait(file, &serio_raw->wait, wait);
-        mask = serio_raw->dead ? POLLHUP | POLLERR : POLLOUT | POLLWRNORM;
+        mask = serio_raw->dead ? EPOLLHUP | EPOLLERR : EPOLLOUT | EPOLLWRNORM;
        if (serio_raw->head != serio_raw->tail)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/input/serio/userio.c b/drivers/input/serio/userio.c
index a63de06b08bc..9ab5c45c3a9f 100644
--- a/drivers/input/serio/userio.c
+++ b/drivers/input/serio/userio.c
@@ -255,7 +255,7 @@ static __poll_t userio_char_poll(struct file *file, poll_table *wait)
        poll_wait(file, &userio->waitq, wait);
        if (userio->head != userio->tail)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
index e268811dc544..19cd93783c87 100644
--- a/drivers/isdn/capi/capi.c
+++ b/drivers/isdn/capi/capi.c
@@ -731,12 +731,12 @@ capi_poll(struct file *file, poll_table *wait)
        __poll_t mask = 0;
        if (!cdev->ap.applid)
-                return POLLERR;
+                return EPOLLERR;
        poll_wait(file, &(cdev->recvwait), wait);
-        mask = POLLOUT | POLLWRNORM;
+        mask = EPOLLOUT | EPOLLWRNORM;
        if (!skb_queue_empty(&cdev->recvqueue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c
index 34b7704042a4..342585e04fd3 100644
--- a/drivers/isdn/divert/divert_procfs.c
+++ b/drivers/isdn/divert/divert_procfs.c
@@ -125,9 +125,9 @@ isdn_divert_poll(struct file *file, poll_table *wait)
        __poll_t mask = 0;
        poll_wait(file, &(rd_queue), wait);
-        /* mask = POLLOUT | POLLWRNORM; */
+        /* mask = EPOLLOUT | EPOLLWRNORM; */
        if (*((struct divert_info **) file->private_data)) {
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        }
        return mask;
 }                               /* isdn_divert_poll */
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 70f16102a001..5a95587b3117 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -103,9 +103,9 @@ static __poll_t maint_poll(struct file *file, poll_table *wait)
        __poll_t mask = 0;
        poll_wait(file, &msgwaitq, wait);
-        mask = POLLOUT | POLLWRNORM;
+        mask = EPOLLOUT | EPOLLWRNORM;
        if (file->private_data || diva_dbg_q_length()) {
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        }
        return (mask);
 }
diff --git a/drivers/isdn/hardware/eicon/divasi.c b/drivers/isdn/hardware/eicon/divasi.c
index da5cc5ab7e2d..525518c945fe 100644
--- a/drivers/isdn/hardware/eicon/divasi.c
+++ b/drivers/isdn/hardware/eicon/divasi.c
@@ -370,31 +370,31 @@ static __poll_t um_idi_poll(struct file *file, poll_table *wait)
        diva_um_idi_os_context_t *p_os;
        if (!file->private_data) {
-                return (POLLERR);
+                return (EPOLLERR);
        }
        if ((!(p_os =
               (diva_um_idi_os_context_t *)
               diva_um_id_get_os_context(file->private_data)))
            || p_os->aborted) {
-                return (POLLERR);
+                return (EPOLLERR);
        }
        poll_wait(file, &p_os->read_wait, wait);
        if (p_os->aborted) {
-                return (POLLERR);
+                return (EPOLLERR);
        }
        switch (diva_user_mode_idi_ind_ready(file->private_data, file)) {
        case (-1):
-                return (POLLERR);
+                return (EPOLLERR);
        case 0:
                return (0);
        }
-        return (POLLIN | POLLRDNORM);
+        return (EPOLLIN | EPOLLRDNORM);
 }
 static int um_idi_open(struct inode *inode, struct file *file)
diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index fbc788e6f0db..b9980e84f9db 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -653,9 +653,9 @@ static ssize_t divas_read(struct file *file, char __user *buf,
 static __poll_t divas_poll(struct file *file, poll_table *wait)
 {
        if (!file->private_data) {
-                return (POLLERR);
+                return (EPOLLERR);
        }
-        return (POLLIN | POLLRDNORM);
+        return (EPOLLIN | EPOLLRDNORM);
 }
 static const struct file_operations divas_fops = {
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c
index 3478f6f099eb..f52f4622b10b 100644
--- a/drivers/isdn/hardware/eicon/divasproc.c
+++ b/drivers/isdn/hardware/eicon/divasproc.c
@@ -101,7 +101,7 @@ divas_write(struct file *file, const char __user *buf, size_t count, loff_t *off
 static __poll_t divas_poll(struct file *file, poll_table *wait)
 {
-        return (POLLERR);
+        return (EPOLLERR);
 }
 static int divas_open(struct inode *inode, struct file *file)
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c
index 6abea6915f49..6e898b90e86e 100644
--- a/drivers/isdn/hysdn/hysdn_proclog.c
+++ b/drivers/isdn/hysdn/hysdn_proclog.c
@@ -294,7 +294,7 @@ hysdn_log_poll(struct file *file, poll_table *wait)
        poll_wait(file, &(pd->rd_queue), wait);
        if (*((struct log_data **) file->private_data))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }                               /* hysdn_log_poll */
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
index 0521c32949d4..7c6f3f5d9d9a 100644
--- a/drivers/isdn/i4l/isdn_common.c
+++ b/drivers/isdn/i4l/isdn_common.c
@@ -1237,22 +1237,22 @@ isdn_poll(struct file *file, poll_table *wait)
        mutex_lock(&isdn_mutex);
        if (minor == ISDN_MINOR_STATUS) {
                poll_wait(file, &(dev->info_waitq), wait);
-                /* mask = POLLOUT | POLLWRNORM; */
+                /* mask = EPOLLOUT | EPOLLWRNORM; */
                if (file->private_data) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                }
                goto out;
        }
        if (minor >= ISDN_MINOR_CTRL && minor <= ISDN_MINOR_CTRLMAX) {
                if (drvidx < 0) {
                        /* driver deregistered while file open */
-                        mask = POLLHUP;
+                        mask = EPOLLHUP;
                        goto out;
                }
                poll_wait(file, &(dev->drv[drvidx]->st_waitq), wait);
-                mask = POLLOUT | POLLWRNORM;
+                mask = EPOLLOUT | EPOLLWRNORM;
                if (dev->drv[drvidx]->stavail) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                }
                goto out;
        }
@@ -1262,7 +1262,7 @@ isdn_poll(struct file *file, poll_table *wait)
                goto out;
        }
 #endif
-        mask = POLLERR;
+        mask = EPOLLERR;
 out:
        mutex_unlock(&isdn_mutex);
        return mask;
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c
index 57884319b4b1..a7b275ea5de1 100644
--- a/drivers/isdn/i4l/isdn_ppp.c
+++ b/drivers/isdn/i4l/isdn_ppp.c
@@ -704,12 +704,12 @@ isdn_ppp_poll(struct file *file, poll_table *wait)
        if (!(is->state & IPPP_OPEN)) {
                if (is->state == IPPP_CLOSEWAIT)
-                        return POLLHUP;
+                        return EPOLLHUP;
                printk(KERN_DEBUG "isdn_ppp: device not open\n");
-                return POLLERR;
+                return EPOLLERR;
        }
        /* we're always ready to send .. */
-        mask = POLLOUT | POLLWRNORM;
+        mask = EPOLLOUT | EPOLLWRNORM;
        spin_lock_irqsave(&is->buflock, flags);
        bl = is->last;
@@ -719,7 +719,7 @@ isdn_ppp_poll(struct file *file, poll_table *wait)
         */
        if (bf->next != bl || (is->state & IPPP_NOBLOCK)) {
                is->state &= ~IPPP_NOBLOCK;
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        }
        spin_unlock_irqrestore(&is->buflock, flags);
        return mask;
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index f4272d4e0a26..211ed6cffd10 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -145,7 +145,7 @@ static __poll_t
 mISDN_poll(struct file *filep, poll_table *wait)
 {
        struct mISDNtimerdev    *dev = filep->private_data;
-        __poll_t                mask = POLLERR;
+        __poll_t                mask = EPOLLERR;
        if (*debug & DEBUG_TIMER)
                printk(KERN_DEBUG "%s(%p, %p)\n", __func__, filep, wait);
@@ -153,7 +153,7 @@ mISDN_poll(struct file *filep, poll_table *wait)
                poll_wait(filep, &dev->wait, wait);
                mask = 0;
                if (dev->work || !list_empty(&dev->expired))
-                        mask |= (POLLIN | POLLRDNORM);
+                        mask |= (EPOLLIN | EPOLLRDNORM);
                if (*debug & DEBUG_TIMER)
                        printk(KERN_DEBUG "%s work(%d) empty(%d)\n", __func__,
                               dev->work, list_empty(&dev->expired));
diff --git a/drivers/leds/uleds.c b/drivers/leds/uleds.c
index 5beacab05ed7..0c43bfac9598 100644
--- a/drivers/leds/uleds.c
+++ b/drivers/leds/uleds.c
@@ -183,7 +183,7 @@ static __poll_t uleds_poll(struct file *file, poll_table *wait)
        poll_wait(file, &udev->waitq, wait);
        if (udev->new_data)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 346e6f5f77be..e8ae2e54151c 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -1259,7 +1259,7 @@ static __poll_t smu_fpoll(struct file *file, poll_table *wait)
                spin_lock_irqsave(&pp->lock, flags);
                if (pp->busy && pp->cmd.status != 1)
-                        mask |= POLLIN;
+                        mask |= EPOLLIN;
                spin_unlock_irqrestore(&pp->lock, flags);
        }
        if (pp->mode == smu_file_events) {
diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 08849e33c567..94c0f3f7df69 100644
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -2169,7 +2169,7 @@ pmu_fpoll(struct file *filp, poll_table *wait)
        poll_wait(filp, &pp->wait, wait);
        spin_lock_irqsave(&pp->lock, flags);
        if (pp->rb_get != pp->rb_put)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        spin_unlock_irqrestore(&pp->lock, flags);
        return mask;
 }
diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c
index f84730d63b1f..58bfafc34bc4 100644
--- a/drivers/mailbox/mailbox-test.c
+++ b/drivers/mailbox/mailbox-test.c
@@ -243,7 +243,7 @@ mbox_test_message_poll(struct file *filp, struct poll_table_struct *wait)
        poll_wait(filp, &tdev->waitq, wait);
        if (mbox_test_message_data_ready(tdev))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
index 3f6791afd3e4..a89fd8f44453 100644
--- a/drivers/md/dm-ioctl.c
+++ b/drivers/md/dm-ioctl.c
@@ -1937,7 +1937,7 @@ static __poll_t dm_poll(struct file *filp, poll_table *wait)
        poll_wait(filp, &dm_global_eventq, wait);
        if ((int)(atomic_read(&dm_global_event_nr) - priv->global_event_nr) > 0)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        return mask;
 }
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 0081ace39a64..bc67ab6844f0 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -7891,14 +7891,14 @@ static __poll_t mdstat_poll(struct file *filp, poll_table *wait)
        __poll_t mask;
        if (md_unloading)
-                return POLLIN|POLLRDNORM|POLLERR|POLLPRI;
+                return EPOLLIN|EPOLLRDNORM|EPOLLERR|EPOLLPRI;
        poll_wait(filp, &md_event_waiters, wait);
        /* always allow read */
-        mask = POLLIN | POLLRDNORM;
+        mask = EPOLLIN | EPOLLRDNORM;
        if (seq->poll_event != atomic_read(&md_event_count))
-                mask |= POLLERR | POLLPRI;
+                mask |= EPOLLERR | EPOLLPRI;
        return mask;
 }
diff --git a/drivers/media/cec/cec-api.c b/drivers/media/cec/cec-api.c
index ecc89d9a279b..492db12b8c4d 100644
--- a/drivers/media/cec/cec-api.c
+++ b/drivers/media/cec/cec-api.c
@@ -51,15 +51,15 @@ static __poll_t cec_poll(struct file *filp,
        __poll_t res = 0;
        if (!cec_is_registered(adap))
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        mutex_lock(&adap->lock);
        if (adap->is_configured &&
            adap->transmit_queue_sz < CEC_MAX_MSG_TX_QUEUE_SZ)
-                res |= POLLOUT | POLLWRNORM;
+                res |= EPOLLOUT | EPOLLWRNORM;
        if (fh->queued_msgs)
-                res |= POLLIN | POLLRDNORM;
+                res |= EPOLLIN | EPOLLRDNORM;
        if (fh->total_queued_events)
-                res |= POLLPRI;
+                res |= EPOLLPRI;
        poll_wait(filp, &fh->wait, poll);
        mutex_unlock(&adap->lock);
        return res;
diff --git a/drivers/media/common/saa7146/saa7146_fops.c b/drivers/media/common/saa7146/saa7146_fops.c
index 8ee3eebef4db..d4987fd05d05 100644
--- a/drivers/media/common/saa7146/saa7146_fops.c
+++ b/drivers/media/common/saa7146/saa7146_fops.c
@@ -332,7 +332,7 @@ static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait)
        if (vdev->vfl_type == VFL_TYPE_VBI) {
                if (fh->dev->ext_vv_data->capabilities & V4L2_CAP_SLICED_VBI_OUTPUT)
-                        return res | POLLOUT | POLLWRNORM;
+                        return res | EPOLLOUT | EPOLLWRNORM;
                if( 0 == fh->vbi_q.streaming )
                        return res | videobuf_poll_stream(file, &fh->vbi_q, wait);
                q = &fh->vbi_q;
@@ -346,13 +346,13 @@ static __poll_t __fops_poll(struct file *file, struct poll_table_struct *wait)
        if (!buf) {
                DEB_D("buf == NULL!\n");
-                return res | POLLERR;
+                return res | EPOLLERR;
        }
        poll_wait(file, &buf->done, wait);
        if (buf->state == VIDEOBUF_DONE || buf->state == VIDEOBUF_ERROR) {
                DEB_D("poll succeeded!\n");
-                return res | POLLIN | POLLRDNORM;
+                return res | EPOLLIN | EPOLLRDNORM;
        }
        DEB_D("nothing to poll for, buf->state:%d\n", buf->state);
diff --git a/drivers/media/common/siano/smsdvb-debugfs.c b/drivers/media/common/siano/smsdvb-debugfs.c
index 403645fe9079..40891f4f842b 100644
--- a/drivers/media/common/siano/smsdvb-debugfs.c
+++ b/drivers/media/common/siano/smsdvb-debugfs.c
@@ -371,7 +371,7 @@ static __poll_t smsdvb_stats_poll(struct file *file, poll_table *wait)
        rc = smsdvb_stats_wait_read(debug_data);
        kref_put(&debug_data->refcount, smsdvb_debugfs_data_release);
-        return rc > 0 ? POLLIN | POLLRDNORM : 0;
+        return rc > 0 ? EPOLLIN | EPOLLRDNORM : 0;
 }
 static ssize_t smsdvb_stats_read(struct file *file, char __user *user_buf,
diff --git a/drivers/media/common/videobuf2/videobuf2-core.c b/drivers/media/common/videobuf2/videobuf2-core.c
index 9a84c7092714..debe35fc66b4 100644
--- a/drivers/media/common/videobuf2/videobuf2-core.c
+++ b/drivers/media/common/videobuf2/videobuf2-core.c
@@ -2038,9 +2038,9 @@ __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,
        struct vb2_buffer *vb = NULL;
        unsigned long flags;
-        if (!q->is_output && !(req_events & (POLLIN | POLLRDNORM)))
+        if (!q->is_output && !(req_events & (EPOLLIN | EPOLLRDNORM)))
                return 0;
-        if (q->is_output && !(req_events & (POLLOUT | POLLWRNORM)))
+        if (q->is_output && !(req_events & (EPOLLOUT | EPOLLWRNORM)))
                return 0;
        /*
@@ -2048,18 +2048,18 @@ __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,
         */
        if (q->num_buffers == 0 && !vb2_fileio_is_active(q)) {
                if (!q->is_output && (q->io_modes & VB2_READ) &&
-                                (req_events & (POLLIN | POLLRDNORM))) {
+                                (req_events & (EPOLLIN | EPOLLRDNORM))) {
                        if (__vb2_init_fileio(q, 1))
-                                return POLLERR;
+                                return EPOLLERR;
                }
                if (q->is_output && (q->io_modes & VB2_WRITE) &&
-                                (req_events & (POLLOUT | POLLWRNORM))) {
+                                (req_events & (EPOLLOUT | EPOLLWRNORM))) {
                        if (__vb2_init_fileio(q, 0))
-                                return POLLERR;
+                                return EPOLLERR;
                        /*
                         * Write to OUTPUT queue can be done immediately.
                         */
-                        return POLLOUT | POLLWRNORM;
+                        return EPOLLOUT | EPOLLWRNORM;
                }
        }
@@ -2068,24 +2068,24 @@ __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,
         * error flag is set.
         */
        if (!vb2_is_streaming(q) || q->error)
-                return POLLERR;
+                return EPOLLERR;
        /*
         * If this quirk is set and QBUF hasn't been called yet then
-         * return POLLERR as well. This only affects capture queues, output
+         * return EPOLLERR as well. This only affects capture queues, output
         * queues will always initialize waiting_for_buffers to false.
         * This quirk is set by V4L2 for backwards compatibility reasons.
         */
        if (q->quirk_poll_must_check_waiting_for_buffers &&
-            q->waiting_for_buffers && (req_events & (POLLIN | POLLRDNORM)))
+            q->waiting_for_buffers && (req_events & (EPOLLIN | EPOLLRDNORM)))
-                return POLLERR;
+                return EPOLLERR;
        /*
         * For output streams you can call write() as long as there are fewer
         * buffers queued than there are buffers available.
         */
        if (q->is_output && q->fileio && q->queued_count < q->num_buffers)
-                return POLLOUT | POLLWRNORM;
+                return EPOLLOUT | EPOLLWRNORM;
        if (list_empty(&q->done_list)) {
                /*
@@ -2093,7 +2093,7 @@ __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,
                 * return immediately. DQBUF will return -EPIPE.
                 */
                if (q->last_buffer_dequeued)
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
                poll_wait(file, &q->done_wq, wait);
        }
@@ -2110,8 +2110,8 @@ __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,
        if (vb && (vb->state == VB2_BUF_STATE_DONE
                        || vb->state == VB2_BUF_STATE_ERROR)) {
                return (q->is_output) ?
-                                POLLOUT | POLLWRNORM :
+                                EPOLLOUT | EPOLLWRNORM :
-                                POLLIN | POLLRDNORM;
+                                EPOLLIN | EPOLLRDNORM;
        }
        return 0;
 }
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index d9a487aab99c..886a2d8d5c6c 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -658,7 +658,7 @@ int vb2_queue_init(struct vb2_queue *q)
                        == V4L2_BUF_FLAG_TIMESTAMP_COPY;
        /*
         * For compatibility with vb1: if QBUF hasn't been called yet, then
-         * return POLLERR as well. This only affects capture queues, output
+         * return EPOLLERR as well. This only affects capture queues, output
         * queues will always initialize waiting_for_buffers to false.
         */
        q->quirk_poll_must_check_waiting_for_buffers = true;
@@ -683,8 +683,8 @@ __poll_t vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait)
                struct v4l2_fh *fh = file->private_data;
                if (v4l2_event_pending(fh))
-                        res = POLLPRI;
+                        res = EPOLLPRI;
-                else if (req_events & POLLPRI)
+                else if (req_events & EPOLLPRI)
                        poll_wait(file, &fh->wait, wait);
        }
@@ -921,7 +921,7 @@ __poll_t vb2_fop_poll(struct file *file, poll_table *wait)
        WARN_ON(!lock);
        if (lock && mutex_lock_interruptible(lock))
-                return POLLERR;
+                return EPOLLERR;
        fileio = q->fileio;
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index bc198f84b9cd..6d53af00190e 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -1179,7 +1179,7 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
        __poll_t mask = 0;
        if ((!dmxdevfilter) || dmxdevfilter->dev->exit)
-                return POLLERR;
+                return EPOLLERR;
        if (dvb_vb2_is_streaming(&dmxdevfilter->vb2_ctx))
                return dvb_vb2_poll(&dmxdevfilter->vb2_ctx, file, wait);
@@ -1191,10 +1191,10 @@ static __poll_t dvb_demux_poll(struct file *file, poll_table *wait)
                return 0;
        if (dmxdevfilter->buffer.error)
-                mask |= (POLLIN | POLLRDNORM | POLLPRI | POLLERR);
+                mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI | EPOLLERR);
        if (!dvb_ringbuffer_empty(&dmxdevfilter->buffer))
-                mask |= (POLLIN | POLLRDNORM | POLLPRI);
+                mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI);
        return mask;
 }
@@ -1331,7 +1331,7 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
        dprintk("%s\n", __func__);
        if (dmxdev->exit)
-                return POLLERR;
+                return EPOLLERR;
        if (dvb_vb2_is_streaming(&dmxdev->dvr_vb2_ctx))
                return dvb_vb2_poll(&dmxdev->dvr_vb2_ctx, file, wait);
@@ -1343,12 +1343,12 @@ static __poll_t dvb_dvr_poll(struct file *file, poll_table *wait)
 #endif
        if (need_ringbuffer) {
                if (dmxdev->dvr_buffer.error)
-                        mask |= (POLLIN | POLLRDNORM | POLLPRI | POLLERR);
+                        mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI | EPOLLERR);
                if (!dvb_ringbuffer_empty(&dmxdev->dvr_buffer))
-                        mask |= (POLLIN | POLLRDNORM | POLLPRI);
+                        mask |= (EPOLLIN | EPOLLRDNORM | EPOLLPRI);
        } else
-                mask |= (POLLOUT | POLLWRNORM | POLLPRI);
+                mask |= (EPOLLOUT | EPOLLWRNORM | EPOLLPRI);
        return mask;
 }
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c
index b462ebc0c544..204d0f6c678d 100644
--- a/drivers/media/dvb-core/dvb_ca_en50221.c
+++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -1796,7 +1796,7 @@ static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
        dprintk("%s\n", __func__);
        if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        /* if there is something, return now */
        if (mask)
@@ -1806,7 +1806,7 @@ static __poll_t dvb_ca_en50221_io_poll(struct file *file, poll_table *wait)
        poll_wait(file, &ca->wait_queue, wait);
        if (dvb_ca_en50221_io_read_condition(ca, &result, &slot) == 1)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        return mask;
 }
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 87fc1bcae5ae..a7ed16e0841d 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2646,7 +2646,7 @@ static __poll_t dvb_frontend_poll(struct file *file, struct poll_table_struct *w
        poll_wait (file, &fepriv->events.wait_queue, wait);
        if (fepriv->events.eventw != fepriv->events.eventr)
-                return (POLLIN | POLLRDNORM | POLLPRI);
+                return (EPOLLIN | EPOLLRDNORM | EPOLLPRI);
        return 0;
 }
diff --git a/drivers/media/firewire/firedtv-ci.c b/drivers/media/firewire/firedtv-ci.c
index b4ddfff74267..8dc5a7495abe 100644
--- a/drivers/media/firewire/firedtv-ci.c
+++ b/drivers/media/firewire/firedtv-ci.c
@@ -209,7 +209,7 @@ static int fdtv_ca_ioctl(struct file *file, unsigned int cmd, void *arg)
 static __poll_t fdtv_ca_io_poll(struct file *file, poll_table *wait)
 {
-        return POLLIN;
+        return EPOLLIN;
 }
 static const struct file_operations fdtv_ca_fops = {
diff --git a/drivers/media/i2c/saa6588.c b/drivers/media/i2c/saa6588.c
index 00640233a5e3..c3089bd34df2 100644
--- a/drivers/media/i2c/saa6588.c
+++ b/drivers/media/i2c/saa6588.c
@@ -413,7 +413,7 @@ static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
        case SAA6588_CMD_POLL:
                a->result = 0;
                if (s->data_available_for_read)
-                        a->result |= POLLIN | POLLRDNORM;
+                        a->result |= EPOLLIN | EPOLLRDNORM;
                poll_wait(a->instance, &s->read_queue, a->event_list);
                break;
diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 3049b1f505e5..67ac51eff15c 100644
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -105,7 +105,7 @@ static __poll_t media_poll(struct file *filp,
        struct media_devnode *devnode = media_devnode_data(filp);
        if (!media_devnode_is_registered(devnode))
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        if (!devnode->fops->poll)
                return DEFAULT_POLLMASK;
        return devnode->fops->poll(filp, poll);
diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c
index c988669e22ff..f697698fe38d 100644
--- a/drivers/media/pci/bt8xx/bttv-driver.c
+++ b/drivers/media/pci/bt8xx/bttv-driver.c
@@ -2964,39 +2964,39 @@ static __poll_t bttv_poll(struct file *file, poll_table *wait)
        __poll_t req_events = poll_requested_events(wait);
        if (v4l2_event_pending(&fh->fh))
-                rc = POLLPRI;
+                rc = EPOLLPRI;
-        else if (req_events & POLLPRI)
+        else if (req_events & EPOLLPRI)
                poll_wait(file, &fh->fh.wait, wait);
-        if (!(req_events & (POLLIN | POLLRDNORM)))
+        if (!(req_events & (EPOLLIN | EPOLLRDNORM)))
                return rc;
        if (V4L2_BUF_TYPE_VBI_CAPTURE == fh->type) {
                if (!check_alloc_btres_lock(fh->btv,fh,RESOURCE_VBI))
-                        return rc | POLLERR;
+                        return rc | EPOLLERR;
                return rc | videobuf_poll_stream(file, &fh->vbi, wait);
        }
        if (check_btres(fh,RESOURCE_VIDEO_STREAM)) {
                /* streaming capture */
                if (list_empty(&fh->cap.stream))
-                        return rc | POLLERR;
+                        return rc | EPOLLERR;
                buf = list_entry(fh->cap.stream.next,struct bttv_buffer,vb.stream);
        } else {
                /* read() capture */
                if (NULL == fh->cap.read_buf) {
                        /* need to capture a new frame */
                        if (locked_btres(fh->btv,RESOURCE_VIDEO_STREAM))
-                                return rc | POLLERR;
+                                return rc | EPOLLERR;
                        fh->cap.read_buf = videobuf_sg_alloc(fh->cap.msize);
                        if (NULL == fh->cap.read_buf)
-                                return rc | POLLERR;
+                                return rc | EPOLLERR;
                        fh->cap.read_buf->memory = V4L2_MEMORY_USERPTR;
                        field = videobuf_next_field(&fh->cap);
                        if (0 != fh->cap.ops->buf_prepare(&fh->cap,fh->cap.read_buf,field)) {
                                kfree (fh->cap.read_buf);
                                fh->cap.read_buf = NULL;
-                                return rc | POLLERR;
+                                return rc | EPOLLERR;
                        }
                        fh->cap.ops->buf_queue(&fh->cap,fh->cap.read_buf);
                        fh->cap.read_off = 0;
@@ -3007,7 +3007,7 @@ static __poll_t bttv_poll(struct file *file, poll_table *wait)
        poll_wait(file, &buf->vb.done, wait);
        if (buf->vb.state == VIDEOBUF_DONE ||
            buf->vb.state == VIDEOBUF_ERROR)
-                rc = rc | POLLIN|POLLRDNORM;
+                rc = rc | EPOLLIN|EPOLLRDNORM;
        return rc;
 }
@@ -3338,8 +3338,8 @@ static __poll_t radio_poll(struct file *file, poll_table *wait)
        __poll_t res = 0;
        if (v4l2_event_pending(&fh->fh))
-                res = POLLPRI;
+                res = EPOLLPRI;
-        else if (req_events & POLLPRI)
+        else if (req_events & EPOLLPRI)
                poll_wait(file, &fh->fh.wait, wait);
        radio_enable(btv);
        cmd.instance = file;
diff --git a/drivers/media/pci/cx18/cx18-fileops.c b/drivers/media/pci/cx18/cx18-fileops.c
index a8dbb922ba4b..a3f44e30f821 100644
--- a/drivers/media/pci/cx18/cx18-fileops.c
+++ b/drivers/media/pci/cx18/cx18-fileops.c
@@ -613,7 +613,7 @@ __poll_t cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
        /* Start a capture if there is none */
        if (!eof && !test_bit(CX18_F_S_STREAMING, &s->s_flags) &&
-                        (req_events & (POLLIN | POLLRDNORM))) {
+                        (req_events & (EPOLLIN | EPOLLRDNORM))) {
                int rc;
                mutex_lock(&cx->serialize_lock);
@@ -622,7 +622,7 @@ __poll_t cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
                if (rc) {
                        CX18_DEBUG_INFO("Could not start capture for %s (%d)\n",
                                        s->name, rc);
-                        return POLLERR;
+                        return EPOLLERR;
                }
                CX18_DEBUG_FILE("Encoder poll started capture\n");
        }
@@ -632,23 +632,23 @@ __poll_t cx18_v4l2_enc_poll(struct file *filp, poll_table *wait)
                __poll_t videobuf_poll = videobuf_poll_stream(filp, &s->vbuf_q, wait);
                if (v4l2_event_pending(&id->fh))
-                        res |= POLLPRI;
+                        res |= EPOLLPRI;
-                if (eof && videobuf_poll == POLLERR)
+                if (eof && videobuf_poll == EPOLLERR)
-                        return res | POLLHUP;
+                        return res | EPOLLHUP;
                return res | videobuf_poll;
        }
        /* add stream's waitq to the poll list */
        CX18_DEBUG_HI_FILE("Encoder poll\n");
        if (v4l2_event_pending(&id->fh))
-                res |= POLLPRI;
+                res |= EPOLLPRI;
        else
                poll_wait(filp, &s->waitq, wait);
        if (atomic_read(&s->q_full.depth))
-                return res | POLLIN | POLLRDNORM;
+                return res | EPOLLIN | EPOLLRDNORM;
        if (eof)
-                return res | POLLHUP;
+                return res | EPOLLHUP;
        return res;
 }
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index 42b42824382c..f9bee36f1cad 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -745,9 +745,9 @@ static __poll_t ts_poll(struct file *file, poll_table *wait)
        poll_wait(file, &input->dma->wq, wait);
        poll_wait(file, &output->dma->wq, wait);
        if (ddb_input_avail(input) >= 188)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (ddb_output_free(output) >= 188)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/drivers/media/pci/ivtv/ivtv-fileops.c b/drivers/media/pci/ivtv/ivtv-fileops.c
index 4aa773507201..6196daae4b3e 100644
--- a/drivers/media/pci/ivtv/ivtv-fileops.c
+++ b/drivers/media/pci/ivtv/ivtv-fileops.c
@@ -747,7 +747,7 @@ __poll_t ivtv_v4l2_dec_poll(struct file *filp, poll_table *wait)
                /* Turn off the old-style vsync events */
                clear_bit(IVTV_F_I_EV_VSYNC_ENABLED, &itv->i_flags);
                if (v4l2_event_pending(&id->fh))
-                        res = POLLPRI;
+                        res = EPOLLPRI;
        } else {
                /* This is the old-style API which is here only for backwards
                   compatibility. */
@@ -755,12 +755,12 @@ __poll_t ivtv_v4l2_dec_poll(struct file *filp, poll_table *wait)
                set_bit(IVTV_F_I_EV_VSYNC_ENABLED, &itv->i_flags);
                if (test_bit(IVTV_F_I_EV_VSYNC, &itv->i_flags) ||
                    test_bit(IVTV_F_I_EV_DEC_STOPPED, &itv->i_flags))
-                        res = POLLPRI;
+                        res = EPOLLPRI;
        }
        /* Allow write if buffers are available for writing */
        if (s->q_free.buffers)
-                res |= POLLOUT | POLLWRNORM;
+                res |= EPOLLOUT | EPOLLWRNORM;
        return res;
 }
@@ -776,7 +776,7 @@ __poll_t ivtv_v4l2_enc_poll(struct file *filp, poll_table *wait)
        /* Start a capture if there is none */
        if (!eof && !test_bit(IVTV_F_S_STREAMING, &s->s_flags) &&
                        s->type != IVTV_ENC_STREAM_TYPE_RAD &&
-                        (req_events & (POLLIN | POLLRDNORM))) {
+                        (req_events & (EPOLLIN | EPOLLRDNORM))) {
                int rc;
                mutex_lock(&itv->serialize_lock);
@@ -785,7 +785,7 @@ __poll_t ivtv_v4l2_enc_poll(struct file *filp, poll_table *wait)
                if (rc) {
                        IVTV_DEBUG_INFO("Could not start capture for %s (%d)\n",
                                        s->name, rc);
-                        return POLLERR;
+                        return EPOLLERR;
                }
                IVTV_DEBUG_FILE("Encoder poll started capture\n");
        }
@@ -794,14 +794,14 @@ __poll_t ivtv_v4l2_enc_poll(struct file *filp, poll_table *wait)
        IVTV_DEBUG_HI_FILE("Encoder poll\n");
        poll_wait(filp, &s->waitq, wait);
        if (v4l2_event_pending(&id->fh))
-                res |= POLLPRI;
+                res |= EPOLLPRI;
        else
                poll_wait(filp, &id->fh.wait, wait);
        if (s->q_full.length || s->q_io.length)
-                return res | POLLIN | POLLRDNORM;
+                return res | EPOLLIN | EPOLLRDNORM;
        if (eof)
-                return res | POLLHUP;
+                return res | EPOLLHUP;
        return res;
 }
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index ae83293723ba..dedcdb573427 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1430,7 +1430,7 @@ static __poll_t meye_poll(struct file *file, poll_table *wait)
        mutex_lock(&meye.lock);
        poll_wait(file, &meye.proc_list, wait);
        if (kfifo_len(&meye.doneq))
-                res |= POLLIN | POLLRDNORM;
+                res |= EPOLLIN | EPOLLRDNORM;
        mutex_unlock(&meye.lock);
        return res;
 }
diff --git a/drivers/media/pci/saa7164/saa7164-encoder.c b/drivers/media/pci/saa7164/saa7164-encoder.c
index e7b31a5b14fd..32136ebe4f61 100644
--- a/drivers/media/pci/saa7164/saa7164-encoder.c
+++ b/drivers/media/pci/saa7164/saa7164-encoder.c
@@ -925,13 +925,13 @@ static __poll_t fops_poll(struct file *file, poll_table *wait)
        saa7164_histogram_update(&port->poll_interval,
                port->last_poll_msecs_diff);
-        if (!(req_events & (POLLIN | POLLRDNORM)))
+        if (!(req_events & (EPOLLIN | EPOLLRDNORM)))
                return mask;
        if (atomic_cmpxchg(&fh->v4l_reading, 0, 1) == 0) {
                if (atomic_inc_return(&port->v4l_reader_count) == 1) {
                        if (saa7164_encoder_initialize(port) < 0)
-                                return mask | POLLERR;
+                                return mask | EPOLLERR;
                        saa7164_encoder_start_streaming(port);
                        msleep(200);
                }
@@ -939,7 +939,7 @@ static __poll_t fops_poll(struct file *file, poll_table *wait)
        /* Pull the first buffer from the used list */
        if (!list_empty(&port->list_buf_used.list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/media/pci/saa7164/saa7164-vbi.c b/drivers/media/pci/saa7164/saa7164-vbi.c
index 6f97c8f2e00d..64ab91c24c18 100644
--- a/drivers/media/pci/saa7164/saa7164-vbi.c
+++ b/drivers/media/pci/saa7164/saa7164-vbi.c
@@ -650,7 +650,7 @@ static __poll_t fops_poll(struct file *file, poll_table *wait)
        /* Pull the first buffer from the used list */
        if (!list_empty(&port->list_buf_used.list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/media/pci/ttpci/av7110_av.c b/drivers/media/pci/ttpci/av7110_av.c
index 4d10e2f979d2..4daba76ec240 100644
--- a/drivers/media/pci/ttpci/av7110_av.c
+++ b/drivers/media/pci/ttpci/av7110_av.c
@@ -951,15 +951,15 @@ static __poll_t dvb_video_poll(struct file *file, poll_table *wait)
        poll_wait(file, &av7110->video_events.wait_queue, wait);
        if (av7110->video_events.eventw != av7110->video_events.eventr)
-                mask = POLLPRI;
+                mask = EPOLLPRI;
        if ((file->f_flags & O_ACCMODE) != O_RDONLY) {
                if (av7110->playing) {
                        if (FREE_COND)
-                                mask |= (POLLOUT | POLLWRNORM);
+                                mask |= (EPOLLOUT | EPOLLWRNORM);
                } else {
                        /* if not playing: may play if asked for */
-                        mask |= (POLLOUT | POLLWRNORM);
+                        mask |= (EPOLLOUT | EPOLLWRNORM);
                }
        }
@@ -1001,9 +1001,9 @@ static __poll_t dvb_audio_poll(struct file *file, poll_table *wait)
        if (av7110->playing) {
                if (dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024)
-                        mask |= (POLLOUT | POLLWRNORM);
+                        mask |= (EPOLLOUT | EPOLLWRNORM);
        } else /* if not playing: may play if asked for */
-                mask = (POLLOUT | POLLWRNORM);
+                mask = (EPOLLOUT | EPOLLWRNORM);
        return mask;
 }
diff --git a/drivers/media/pci/ttpci/av7110_ca.c b/drivers/media/pci/ttpci/av7110_ca.c
index 96ca227cf51b..d8c2f1b34d74 100644
--- a/drivers/media/pci/ttpci/av7110_ca.c
+++ b/drivers/media/pci/ttpci/av7110_ca.c
@@ -237,10 +237,10 @@ static __poll_t dvb_ca_poll (struct file *file, poll_table *wait)
        poll_wait(file, &wbuf->queue, wait);
        if (!dvb_ringbuffer_empty(rbuf))
-                mask |= (POLLIN | POLLRDNORM);
+                mask |= (EPOLLIN | EPOLLRDNORM);
        if (dvb_ringbuffer_free(wbuf) > 1024)
-                mask |= (POLLOUT | POLLWRNORM);
+                mask |= (EPOLLOUT | EPOLLWRNORM);
        return mask;
 }
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index c464dae0389c..8d4e7d930a66 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -2513,10 +2513,10 @@ zoran_poll (struct file *file,
        /* we should check whether buffers are ready to be synced on
         * (w/o waits - O_NONBLOCK) here
-         * if ready for read (sync), return POLLIN|POLLRDNORM,
+         * if ready for read (sync), return EPOLLIN|EPOLLRDNORM,
-         * if ready for write (sync), return POLLOUT|POLLWRNORM,
+         * if ready for write (sync), return EPOLLOUT|EPOLLWRNORM,
-         * if error, return POLLERR,
+         * if error, return EPOLLERR,
-         * if no buffers queued or so, return POLLNVAL
+         * if no buffers queued or so, return EPOLLNVAL
         */
        switch (fh->map_mode) {
@@ -2536,7 +2536,7 @@ zoran_poll (struct file *file,
                if (fh->buffers.active != ZORAN_FREE &&
                    /* Buffer ready to DQBUF? */
                    zr->v4l_buffers.buffer[frame].state == BUZ_STATE_DONE)
-                        res |= POLLIN | POLLRDNORM;
+                        res |= EPOLLIN | EPOLLRDNORM;
                spin_unlock_irqrestore(&zr->spinlock, flags);
                break;
@@ -2557,9 +2557,9 @@ zoran_poll (struct file *file,
                if (fh->buffers.active != ZORAN_FREE &&
                    zr->jpg_buffers.buffer[frame].state == BUZ_STATE_DONE) {
                        if (fh->map_mode == ZORAN_MAP_MODE_JPG_REC)
-                                res |= POLLIN | POLLRDNORM;
+                                res |= EPOLLIN | EPOLLRDNORM;
                        else
-                                res |= POLLOUT | POLLWRNORM;
+                                res |= EPOLLOUT | EPOLLWRNORM;
                }
                spin_unlock_irqrestore(&zr->spinlock, flags);
@@ -2570,7 +2570,7 @@ zoran_poll (struct file *file,
                        KERN_ERR
                        "%s: %s - internal error, unknown map_mode=%d\n",
                        ZR_DEVNAME(zr), __func__, fh->map_mode);
-                res |= POLLERR;
+                res |= EPOLLERR;
        }
        return res;
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index de285a269390..200c47c69a75 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -1272,9 +1272,9 @@ static __poll_t viu_poll(struct file *file, struct poll_table_struct *wait)
        __poll_t res = v4l2_ctrl_poll(file, wait);
        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
-                return POLLERR;
+                return EPOLLERR;
-        if (!(req_events & (POLLIN | POLLRDNORM)))
+        if (!(req_events & (EPOLLIN | EPOLLRDNORM)))
                return res;
        mutex_lock(&dev->lock);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index f15cf24c1c63..d5b94fc0040e 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1008,7 +1008,7 @@ static __poll_t s5p_mfc_poll(struct file *file,
         */
        if ((!src_q->streaming || list_empty(&src_q->queued_list))
                && (!dst_q->streaming || list_empty(&dst_q->queued_list))) {
-                rc = POLLERR;
+                rc = EPOLLERR;
                goto end;
        }
        mutex_unlock(&dev->mfc_mutex);
@@ -1017,14 +1017,14 @@ static __poll_t s5p_mfc_poll(struct file *file,
        poll_wait(file, &dst_q->done_wq, wait);
        mutex_lock(&dev->mfc_mutex);
        if (v4l2_event_pending(&ctx->fh))
-                rc |= POLLPRI;
+                rc |= EPOLLPRI;
        spin_lock_irqsave(&src_q->done_lock, flags);
        if (!list_empty(&src_q->done_list))
                src_vb = list_first_entry(&src_q->done_list, struct vb2_buffer,
                                                                done_entry);
        if (src_vb && (src_vb->state == VB2_BUF_STATE_DONE
                                || src_vb->state == VB2_BUF_STATE_ERROR))
-                rc |= POLLOUT | POLLWRNORM;
+                rc |= EPOLLOUT | EPOLLWRNORM;
        spin_unlock_irqrestore(&src_q->done_lock, flags);
        spin_lock_irqsave(&dst_q->done_lock, flags);
        if (!list_empty(&dst_q->done_list))
@@ -1032,7 +1032,7 @@ static __poll_t s5p_mfc_poll(struct file *file,
                                                                done_entry);
        if (dst_vb && (dst_vb->state == VB2_BUF_STATE_DONE
                                || dst_vb->state == VB2_BUF_STATE_ERROR))
-                rc |= POLLIN | POLLRDNORM;
+                rc |= EPOLLIN | EPOLLRDNORM;
        spin_unlock_irqrestore(&dst_q->done_lock, flags);
 end:
        mutex_unlock(&dev->mfc_mutex);
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 70fc5f01942d..c86dd2fdab84 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -809,10 +809,10 @@ static __poll_t soc_camera_poll(struct file *file, poll_table *pt)
 {
        struct soc_camera_device *icd = file->private_data;
        struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
-        __poll_t res = POLLERR;
+        __poll_t res = EPOLLERR;
        if (icd->streamer != file)
-                return POLLERR;
+                return EPOLLERR;
        mutex_lock(&ici->host_lock);
        res = ici->ops->poll(file, pt);
diff --git a/drivers/media/platform/vivid/vivid-radio-rx.c b/drivers/media/platform/vivid/vivid-radio-rx.c
index fcb7a9f015b6..f834f7df8cf9 100644
--- a/drivers/media/platform/vivid/vivid-radio-rx.c
+++ b/drivers/media/platform/vivid/vivid-radio-rx.c
@@ -142,7 +142,7 @@ retry:
 __poll_t vivid_radio_rx_poll(struct file *file, struct poll_table_struct *wait)
 {
-        return POLLIN | POLLRDNORM | v4l2_ctrl_poll(file, wait);
+        return EPOLLIN | EPOLLRDNORM | v4l2_ctrl_poll(file, wait);
 }
 int vivid_radio_rx_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band)
diff --git a/drivers/media/platform/vivid/vivid-radio-tx.c b/drivers/media/platform/vivid/vivid-radio-tx.c
index af4907a197a3..308b13f85dc0 100644
--- a/drivers/media/platform/vivid/vivid-radio-tx.c
+++ b/drivers/media/platform/vivid/vivid-radio-tx.c
@@ -105,7 +105,7 @@ retry:
 __poll_t vivid_radio_tx_poll(struct file *file, struct poll_table_struct *wait)
 {
-        return POLLOUT | POLLWRNORM | v4l2_ctrl_poll(file, wait);
+        return EPOLLOUT | EPOLLWRNORM | v4l2_ctrl_poll(file, wait);
 }
 int vidioc_g_modulator(struct file *file, void *fh, struct v4l2_modulator *a)
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index af7c68b344d1..5b82e63885cd 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -488,14 +488,14 @@ static __poll_t cadet_poll(struct file *file, struct poll_table_struct *wait)
        __poll_t res = v4l2_ctrl_poll(file, wait);
        poll_wait(file, &dev->read_queue, wait);
-        if (dev->rdsstat == 0 && (req_events & (POLLIN | POLLRDNORM))) {
+        if (dev->rdsstat == 0 && (req_events & (EPOLLIN | EPOLLRDNORM))) {
                mutex_lock(&dev->lock);
                if (dev->rdsstat == 0)
                        cadet_start_rds(dev);
                mutex_unlock(&dev->lock);
        }
        if (cadet_has_rds_data(dev))
-                res |= POLLIN | POLLRDNORM;
+                res |= EPOLLIN | EPOLLRDNORM;
        return res;
 }
diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
index bff9789ae9bc..b52e678c6901 100644
--- a/drivers/media/radio/radio-si476x.c
+++ b/drivers/media/radio/radio-si476x.c
@@ -1158,15 +1158,15 @@ static __poll_t si476x_radio_fops_poll(struct file *file,
        __poll_t req_events = poll_requested_events(pts);
        __poll_t err = v4l2_ctrl_poll(file, pts);
-        if (req_events & (POLLIN | POLLRDNORM)) {
+        if (req_events & (EPOLLIN | EPOLLRDNORM)) {
                if (atomic_read(&radio->core->is_alive))
                        poll_wait(file, &radio->core->rds_read_queue, pts);
                if (!atomic_read(&radio->core->is_alive))
-                        err = POLLHUP;
+                        err = EPOLLHUP;
                if (!kfifo_is_empty(&radio->core->rds_fifo))
-                        err = POLLIN | POLLRDNORM;
+                        err = EPOLLIN | EPOLLRDNORM;
        }
        return err;
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index f92b0f9241a9..58e944591602 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1104,10 +1104,10 @@ static __poll_t wl1273_fm_fops_poll(struct file *file,
                poll_wait(file, &radio->read_queue, pts);
                if (radio->rd_index != radio->wr_index)
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
        } else if (core->mode == WL1273_MODE_TX) {
-                return POLLOUT | POLLWRNORM;
+                return EPOLLOUT | EPOLLWRNORM;
        }
        return 0;
diff --git a/drivers/media/radio/si470x/radio-si470x-common.c b/drivers/media/radio/si470x/radio-si470x-common.c
index 5b477b7d6a66..e0054e0f410d 100644
--- a/drivers/media/radio/si470x/radio-si470x-common.c
+++ b/drivers/media/radio/si470x/radio-si470x-common.c
@@ -514,7 +514,7 @@ static __poll_t si470x_fops_poll(struct file *file,
        __poll_t req_events = poll_requested_events(pts);
        __poll_t retval = v4l2_ctrl_poll(file, pts);
-        if (req_events & (POLLIN | POLLRDNORM)) {
+        if (req_events & (EPOLLIN | EPOLLRDNORM)) {
                /* switch on rds reception */
                if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
                        si470x_rds_on(radio);
@@ -522,7 +522,7 @@ static __poll_t si470x_fops_poll(struct file *file,
                poll_wait(file, &radio->read_queue, pts);
                if (radio->rd_index != radio->wr_index)
-                        retval |= POLLIN | POLLRDNORM;
+                        retval |= EPOLLIN | EPOLLRDNORM;
        }
        return retval;
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index fd603c1b96bb..dccdf6558e6a 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -112,7 +112,7 @@ static __poll_t fm_v4l2_fops_poll(struct file *file, struct poll_table_struct *p
        ret = fmc_is_rds_data_available(fmdev, file, pts);
        mutex_unlock(&fmdev->mutex);
        if (ret < 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index b3544988586e..cc863044c880 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -109,7 +109,7 @@ void ir_lirc_raw_event(struct rc_dev *dev, struct ir_raw_event ev)
                if (LIRC_IS_TIMEOUT(sample) && !fh->send_timeout_reports)
                        continue;
                if (kfifo_put(&fh->rawir, sample))
-                        wake_up_poll(&fh->wait_poll, POLLIN | POLLRDNORM);
+                        wake_up_poll(&fh->wait_poll, EPOLLIN | EPOLLRDNORM);
        }
        spin_unlock_irqrestore(&dev->lirc_fh_lock, flags);
 }
@@ -130,7 +130,7 @@ void ir_lirc_scancode_event(struct rc_dev *dev, struct lirc_scancode *lsc)
        spin_lock_irqsave(&dev->lirc_fh_lock, flags);
        list_for_each_entry(fh, &dev->lirc_fh, list) {
                if (kfifo_put(&fh->scancodes, *lsc))
-                        wake_up_poll(&fh->wait_poll, POLLIN | POLLRDNORM);
+                        wake_up_poll(&fh->wait_poll, EPOLLIN | EPOLLRDNORM);
        }
        spin_unlock_irqrestore(&dev->lirc_fh_lock, flags);
 }
@@ -603,15 +603,15 @@ static __poll_t ir_lirc_poll(struct file *file, struct poll_table_struct *wait)
        poll_wait(file, &fh->wait_poll, wait);
        if (!rcdev->registered) {
-                events = POLLHUP | POLLERR;
+                events = EPOLLHUP | EPOLLERR;
        } else if (rcdev->driver_type != RC_DRIVER_IR_RAW_TX) {
                if (fh->rec_mode == LIRC_MODE_SCANCODE &&
                    !kfifo_is_empty(&fh->scancodes))
-                        events = POLLIN | POLLRDNORM;
+                        events = EPOLLIN | EPOLLRDNORM;
                if (fh->rec_mode == LIRC_MODE_MODE2 &&
                    !kfifo_is_empty(&fh->rawir))
-                        events = POLLIN | POLLRDNORM;
+                        events = EPOLLIN | EPOLLRDNORM;
        }
        return events;
@@ -779,7 +779,7 @@ void ir_lirc_unregister(struct rc_dev *dev)
        spin_lock_irqsave(&dev->lirc_fh_lock, flags);
        list_for_each_entry(fh, &dev->lirc_fh, list)
-                wake_up_poll(&fh->wait_poll, POLLHUP | POLLERR);
+                wake_up_poll(&fh->wait_poll, EPOLLHUP | EPOLLERR);
        spin_unlock_irqrestore(&dev->lirc_fh_lock, flags);
        cdev_device_del(&dev->lirc_cdev, &dev->lirc_dev);
diff --git a/drivers/media/usb/cpia2/cpia2_core.c b/drivers/media/usb/cpia2/cpia2_core.c
index e7524920c618..3dfbb545c0e3 100644
--- a/drivers/media/usb/cpia2/cpia2_core.c
+++ b/drivers/media/usb/cpia2/cpia2_core.c
@@ -2375,7 +2375,7 @@ __poll_t cpia2_poll(struct camera_data *cam, struct file *filp,
 {
        __poll_t status = v4l2_ctrl_poll(filp, wait);
-        if ((poll_requested_events(wait) & (POLLIN | POLLRDNORM)) &&
+        if ((poll_requested_events(wait) & (EPOLLIN | EPOLLRDNORM)) &&
                        !cam->streaming) {
                /* Start streaming */
                cpia2_usb_stream_start(cam,
@@ -2385,7 +2385,7 @@ __poll_t cpia2_poll(struct camera_data *cam, struct file *filp,
        poll_wait(filp, &cam->wq_stream, wait);
        if (cam->curbuff->status == FRAME_READY)
-                status |= POLLIN | POLLRDNORM;
+                status |= EPOLLIN | EPOLLRDNORM;
        return status;
 }
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index 103e3299b77f..b80e6857e2eb 100644
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -1821,11 +1821,11 @@ static __poll_t mpeg_poll(struct file *file,
        __poll_t res = 0;
        if (v4l2_event_pending(&fh->fh))
-                res |= POLLPRI;
+                res |= EPOLLPRI;
        else
                poll_wait(file, &fh->fh.wait, wait);
-        if (!(req_events & (POLLIN | POLLRDNORM)))
+        if (!(req_events & (EPOLLIN | EPOLLRDNORM)))
                return res;
        mutex_lock(&dev->lock);
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 271f35208c49..5b321b8ada3a 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -2018,19 +2018,19 @@ static __poll_t cx231xx_v4l2_poll(struct file *filp, poll_table *wait)
        rc = check_dev(dev);
        if (rc < 0)
-                return POLLERR;
+                return EPOLLERR;
        rc = res_get(fh);
        if (unlikely(rc < 0))
-                return POLLERR;
+                return EPOLLERR;
        if (v4l2_event_pending(&fh->fh))
-                res |= POLLPRI;
+                res |= EPOLLPRI;
        else
                poll_wait(filp, &fh->fh.wait, wait);
-        if (!(req_events & (POLLIN | POLLRDNORM)))
+        if (!(req_events & (EPOLLIN | EPOLLRDNORM)))
                return res;
        if ((V4L2_BUF_TYPE_VIDEO_CAPTURE == fh->type) ||
@@ -2040,7 +2040,7 @@ static __poll_t cx231xx_v4l2_poll(struct file *filp, poll_table *wait)
                mutex_unlock(&dev->lock);
                return res;
        }
-        return res | POLLERR;
+        return res | EPOLLERR;
 }
 /*
diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
index 87e18d0c5766..d29773b8f696 100644
--- a/drivers/media/usb/gspca/gspca.c
+++ b/drivers/media/usb/gspca/gspca.c
@@ -1877,14 +1877,14 @@ static __poll_t dev_poll(struct file *file, poll_table *wait)
        gspca_dbg(gspca_dev, D_FRAM, "poll\n");
-        if (req_events & POLLPRI)
+        if (req_events & EPOLLPRI)
                ret |= v4l2_ctrl_poll(file, wait);
-        if (req_events & (POLLIN | POLLRDNORM)) {
+        if (req_events & (EPOLLIN | EPOLLRDNORM)) {
                /* if reqbufs is not done, the user would use read() */
                if (gspca_dev->memory == GSPCA_MEMORY_NO) {
                        if (read_alloc(gspca_dev, file) != 0) {
-                                ret |= POLLERR;
+                                ret |= EPOLLERR;
                                goto out;
                        }
                }
@@ -1893,17 +1893,17 @@ static __poll_t dev_poll(struct file *file, poll_table *wait)
                /* check if an image has been received */
                if (mutex_lock_interruptible(&gspca_dev->queue_lock) != 0) {
-                        ret |= POLLERR;
+                        ret |= EPOLLERR;
                        goto out;
                }
                if (gspca_dev->fr_o != atomic_read(&gspca_dev->fr_i))
-                        ret |= POLLIN | POLLRDNORM;
+                        ret |= EPOLLIN | EPOLLRDNORM;
                mutex_unlock(&gspca_dev->queue_lock);
        }
 out:
        if (!gspca_dev->present)
-                ret |= POLLHUP;
+                ret |= EPOLLHUP;
        return ret;
 }
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
index 660d4a65401f..77c3d331ff31 100644
--- a/drivers/media/usb/hdpvr/hdpvr-video.c
+++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -528,7 +528,7 @@ static __poll_t hdpvr_poll(struct file *filp, poll_table *wait)
        struct hdpvr_device *dev = video_drvdata(filp);
        __poll_t mask = v4l2_ctrl_poll(filp, wait);
-        if (!(req_events & (POLLIN | POLLRDNORM)))
+        if (!(req_events & (EPOLLIN | EPOLLRDNORM)))
                return mask;
        mutex_lock(&dev->io_mutex);
@@ -553,7 +553,7 @@ static __poll_t hdpvr_poll(struct file *filp, poll_table *wait)
                buf = hdpvr_get_next_buffer(dev);
        }
        if (buf && buf->status == BUFSTAT_READY)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index ad6290e1b699..9fdc57c1658f 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -1181,19 +1181,19 @@ static __poll_t pvr2_v4l2_poll(struct file *file, poll_table *wait)
        int ret;
        if (fh->fw_mode_flag) {
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
                return mask;
        }
        if (!fh->rhp) {
                ret = pvr2_v4l2_iosetup(fh);
-                if (ret) return POLLERR;
+                if (ret) return EPOLLERR;
        }
        poll_wait(file,&fh->wait_data,wait);
        if (pvr2_ioread_avail(fh->rhp) >= 0) {
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        }
        return mask;
diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
index 17ad978c0172..22389b56ec24 100644
--- a/drivers/media/usb/stkwebcam/stk-webcam.c
+++ b/drivers/media/usb/stkwebcam/stk-webcam.c
@@ -729,10 +729,10 @@ static __poll_t v4l_stk_poll(struct file *fp, poll_table *wait)
        poll_wait(fp, &dev->wait_frame, wait);
        if (!is_present(dev))
-                return POLLERR;
+                return EPOLLERR;
        if (!list_empty(&dev->sio_full))
-                return res | POLLIN | POLLRDNORM;
+                return res | EPOLLIN | EPOLLRDNORM;
        return res;
 }
diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
index 96266fa4738c..8314d3fa9241 100644
--- a/drivers/media/usb/tm6000/tm6000-video.c
+++ b/drivers/media/usb/tm6000/tm6000-video.c
@@ -1424,25 +1424,25 @@ __tm6000_poll(struct file *file, struct poll_table_struct *wait)
        __poll_t res = 0;
        if (v4l2_event_pending(&fh->fh))
-                res = POLLPRI;
+                res = EPOLLPRI;
-        else if (req_events & POLLPRI)
+        else if (req_events & EPOLLPRI)
                poll_wait(file, &fh->fh.wait, wait);
        if (V4L2_BUF_TYPE_VIDEO_CAPTURE != fh->type)
-                return res | POLLERR;
+                return res | EPOLLERR;
        if (!!is_res_streaming(fh->dev, fh))
-                return res | POLLERR;
+                return res | EPOLLERR;
        if (!is_res_read(fh->dev, fh)) {
                /* streaming capture */
                if (list_empty(&fh->vb_vidq.stream))
-                        return res | POLLERR;
+                        return res | EPOLLERR;
                buf = list_entry(fh->vb_vidq.stream.next, struct tm6000_buffer, vb.stream);
                poll_wait(file, &buf->vb.done, wait);
                if (buf->vb.state == VIDEOBUF_DONE ||
                    buf->vb.state == VIDEOBUF_ERROR)
-                        return res | POLLIN | POLLRDNORM;
+                        return res | EPOLLIN | EPOLLRDNORM;
-        } else if (req_events & (POLLIN | POLLRDNORM)) {
+        } else if (req_events & (EPOLLIN | EPOLLRDNORM)) {
                /* read() capture */
                return res | videobuf_poll_stream(file, &fh->vb_vidq, wait);
        }
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index b07657149434..ce08b50b8290 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -3462,7 +3462,7 @@ __poll_t v4l2_ctrl_poll(struct file *file, struct poll_table_struct *wait)
        struct v4l2_fh *fh = file->private_data;
        if (v4l2_event_pending(fh))
-                return POLLPRI;
+                return EPOLLPRI;
        poll_wait(file, &fh->wait, wait);
        return 0;
 }
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index cd8127d3f863..0301fe426a43 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -334,7 +334,7 @@ static ssize_t v4l2_write(struct file *filp, const char __user *buf,
 static __poll_t v4l2_poll(struct file *filp, struct poll_table_struct *poll)
 {
        struct video_device *vdev = video_devdata(filp);
-        __poll_t res = POLLERR | POLLHUP;
+        __poll_t res = EPOLLERR | EPOLLHUP;
        if (!vdev->fops->poll)
                return DEFAULT_POLLMASK;
diff --git a/drivers/media/v4l2-core/v4l2-mem2mem.c b/drivers/media/v4l2-core/v4l2-mem2mem.c
index 186156f8952a..c4f963d96a79 100644
--- a/drivers/media/v4l2-core/v4l2-mem2mem.c
+++ b/drivers/media/v4l2-core/v4l2-mem2mem.c
@@ -514,10 +514,10 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                struct v4l2_fh *fh = file->private_data;
                if (v4l2_event_pending(fh))
-                        rc = POLLPRI;
+                        rc = EPOLLPRI;
-                else if (req_events & POLLPRI)
+                else if (req_events & EPOLLPRI)
                        poll_wait(file, &fh->wait, wait);
-                if (!(req_events & (POLLOUT | POLLWRNORM | POLLIN | POLLRDNORM)))
+                if (!(req_events & (EPOLLOUT | EPOLLWRNORM | EPOLLIN | EPOLLRDNORM)))
                        return rc;
        }
@@ -531,7 +531,7 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
         */
        if ((!src_q->streaming || list_empty(&src_q->queued_list))
                && (!dst_q->streaming || list_empty(&dst_q->queued_list))) {
-                rc |= POLLERR;
+                rc |= EPOLLERR;
                goto end;
        }
@@ -548,7 +548,7 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                 */
                if (dst_q->last_buffer_dequeued) {
                        spin_unlock_irqrestore(&dst_q->done_lock, flags);
-                        return rc | POLLIN | POLLRDNORM;
+                        return rc | EPOLLIN | EPOLLRDNORM;
                }
                poll_wait(file, &dst_q->done_wq, wait);
@@ -561,7 +561,7 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                                                done_entry);
        if (src_vb && (src_vb->state == VB2_BUF_STATE_DONE
                        || src_vb->state == VB2_BUF_STATE_ERROR))
-                rc |= POLLOUT | POLLWRNORM;
+                rc |= EPOLLOUT | EPOLLWRNORM;
        spin_unlock_irqrestore(&src_q->done_lock, flags);
        spin_lock_irqsave(&dst_q->done_lock, flags);
@@ -570,7 +570,7 @@ __poll_t v4l2_m2m_poll(struct file *file, struct v4l2_m2m_ctx *m2m_ctx,
                                                done_entry);
        if (dst_vb && (dst_vb->state == VB2_BUF_STATE_DONE
                        || dst_vb->state == VB2_BUF_STATE_ERROR))
-                rc |= POLLIN | POLLRDNORM;
+                rc |= EPOLLIN | EPOLLRDNORM;
        spin_unlock_irqrestore(&dst_q->done_lock, flags);
 end:
diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index 28966fa8c610..c5639817db34 100644
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -476,12 +476,12 @@ static __poll_t subdev_poll(struct file *file, poll_table *wait)
        struct v4l2_fh *fh = file->private_data;
        if (!(sd->flags & V4L2_SUBDEV_FL_HAS_EVENTS))
-                return POLLERR;
+                return EPOLLERR;
        poll_wait(file, &fh->wait, wait);
        if (v4l2_event_pending(fh))
-                return POLLPRI;
+                return EPOLLPRI;
        return 0;
 }
diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
index 9a89d3ae170f..2b3981842b4b 100644
--- a/drivers/media/v4l2-core/videobuf-core.c
+++ b/drivers/media/v4l2-core/videobuf-core.c
@@ -1131,11 +1131,11 @@ __poll_t videobuf_poll_stream(struct file *file,
                if (!list_empty(&q->stream))
                        buf = list_entry(q->stream.next,
                                         struct videobuf_buffer, stream);
-        } else if (req_events & (POLLIN | POLLRDNORM)) {
+        } else if (req_events & (EPOLLIN | EPOLLRDNORM)) {
                if (!q->reading)
                        __videobuf_read_start(q);
                if (!q->reading) {
-                        rc = POLLERR;
+                        rc = EPOLLERR;
                } else if (NULL == q->read_buf) {
                        q->read_buf = list_entry(q->stream.next,
                                                 struct videobuf_buffer,
@@ -1146,7 +1146,7 @@ __poll_t videobuf_poll_stream(struct file *file,
                buf = q->read_buf;
        }
        if (!buf)
-                rc = POLLERR;
+                rc = EPOLLERR;
        if (0 == rc) {
                poll_wait(file, &buf->done, wait);
@@ -1157,10 +1157,10 @@ __poll_t videobuf_poll_stream(struct file *file,
                        case V4L2_BUF_TYPE_VBI_OUTPUT:
                        case V4L2_BUF_TYPE_SLICED_VBI_OUTPUT:
                        case V4L2_BUF_TYPE_SDR_OUTPUT:
-                                rc = POLLOUT | POLLWRNORM;
+                                rc = EPOLLOUT | EPOLLWRNORM;
                                break;
                        default:
-                                rc = POLLIN | POLLRDNORM;
+                                rc = EPOLLIN | EPOLLRDNORM;
                                break;
                        }
                }
diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
index fcb3a92ae85f..8ba41073dd89 100644
--- a/drivers/mfd/ab8500-debugfs.c
+++ b/drivers/mfd/ab8500-debugfs.c
@@ -1267,7 +1267,7 @@ static irqreturn_t ab8500_debug_handler(int irq, void *data)
        if (irq_abb < num_irqs)
                irq_count[irq_abb]++;
        /*
-         * This makes it possible to use poll for events (POLLPRI | POLLERR)
+         * This makes it possible to use poll for events (EPOLLPRI | EPOLLERR)
         * from userspace on sysfs file named <irq-nr>
         */
        sprintf(buf, "%d", irq);
diff --git a/drivers/misc/cxl/file.c b/drivers/misc/cxl/file.c
index 0162516f5e57..bd6ddbdb5cd1 100644
--- a/drivers/misc/cxl/file.c
+++ b/drivers/misc/cxl/file.c
@@ -378,11 +378,11 @@ __poll_t afu_poll(struct file *file, struct poll_table_struct *poll)
        spin_lock_irqsave(&ctx->lock, flags);
        if (ctx_event_pending(ctx))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        else if (ctx->status == CLOSED)
                /* Only error on closed when there are no futher events pending
                 */
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        spin_unlock_irqrestore(&ctx->lock, flags);
        pr_devel("afu_poll pe: %i returning %#x\n", ctx->pe, mask);
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c
index 35693c0a78e2..e9c9ef52c76a 100644
--- a/drivers/misc/hpilo.c
+++ b/drivers/misc/hpilo.c
@@ -519,9 +519,9 @@ static __poll_t ilo_poll(struct file *fp, poll_table *wait)
        poll_wait(fp, &data->ccb_waitq, wait);
        if (is_channel_reset(driver_ccb))
-                return POLLERR;
+                return EPOLLERR;
        else if (ilo_pkt_recv(data->ilo_hw, driver_ccb))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
index e49888eab87d..e9bb1cfa6a7a 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -658,7 +658,7 @@ static __poll_t lis3lv02d_misc_poll(struct file *file, poll_table *wait)
        poll_wait(file, &lis3->misc_wait, wait);
        if (atomic_read(&lis3->count))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c
index 505b710291e6..758dc73602d5 100644
--- a/drivers/misc/mei/main.c
+++ b/drivers/misc/mei/main.c
@@ -551,31 +551,31 @@ static __poll_t mei_poll(struct file *file, poll_table *wait)
        bool notify_en;
        if (WARN_ON(!cl || !cl->dev))
-                return POLLERR;
+                return EPOLLERR;
        dev = cl->dev;
        mutex_lock(&dev->device_lock);
-        notify_en = cl->notify_en && (req_events & POLLPRI);
+        notify_en = cl->notify_en && (req_events & EPOLLPRI);
        if (dev->dev_state != MEI_DEV_ENABLED ||
            !mei_cl_is_connected(cl)) {
-                mask = POLLERR;
+                mask = EPOLLERR;
                goto out;
        }
        if (notify_en) {
                poll_wait(file, &cl->ev_wait, wait);
                if (cl->notify_ev)
-                        mask |= POLLPRI;
+                        mask |= EPOLLPRI;
        }
-        if (req_events & (POLLIN | POLLRDNORM)) {
+        if (req_events & (EPOLLIN | EPOLLRDNORM)) {
                poll_wait(file, &cl->rx_wait, wait);
                if (!list_empty(&cl->rd_completed))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                else
                        mei_cl_read_start(cl, mei_cl_mtu(cl), file);
        }
diff --git a/drivers/misc/mic/cosm/cosm_scif_server.c b/drivers/misc/mic/cosm/cosm_scif_server.c
index 85f7d09cc65f..05a63286741c 100644
--- a/drivers/misc/mic/cosm/cosm_scif_server.c
+++ b/drivers/misc/mic/cosm/cosm_scif_server.c
@@ -55,7 +55,7 @@
 *    message being sent to host SCIF. SCIF_DISCNCT message processing on the
 *    host SCIF sets the host COSM SCIF endpoint state to DISCONNECTED and wakes
 *    up the host COSM thread blocked in scif_poll(..) resulting in
- *    scif_poll(..)  returning POLLHUP.
+ *    scif_poll(..)  returning EPOLLHUP.
 * 5. On the card, scif_peer_release_dev is next called which results in an
 *    SCIF_EXIT message being sent to the host and after receiving the
 *    SCIF_EXIT_ACK from the host the peer device teardown on the card is
@@ -79,7 +79,7 @@
 *    processing. This results in the COSM endpoint on the card being closed and
 *    the SCIF host peer device on the card getting unregistered similar to
 *    steps 3, 4 and 5 for the card shutdown case above. scif_poll(..) on the
- *    host returns POLLHUP as a result.
+ *    host returns EPOLLHUP as a result.
 * 4. On the host, card peer device unregister and SCIF HW remove(..) also
 *    subsequently complete.
 *
@@ -87,11 +87,11 @@
 * ----------
 * If a reset is issued after the card has crashed, there is no SCIF_DISCNT
 * message from the card which would result in scif_poll(..) returning
- * POLLHUP. In this case when the host SCIF driver sends a SCIF_REMOVE_NODE
+ * EPOLLHUP. In this case when the host SCIF driver sends a SCIF_REMOVE_NODE
 * message to itself resulting in the card SCIF peer device being unregistered,
 * this results in a scif_peer_release_dev -> scif_cleanup_scifdev->
 * scif_invalidate_ep call sequence which sets the endpoint state to
- * DISCONNECTED and results in scif_poll(..) returning POLLHUP.
+ * DISCONNECTED and results in scif_poll(..) returning EPOLLHUP.
 */
 #define COSM_SCIF_BACKLOG 16
@@ -190,7 +190,7 @@ static void cosm_send_time(struct cosm_device *cdev)
 /*
 * Close this cosm_device's endpoint after its peer endpoint on the card has
- * been closed. In all cases except MIC card crash POLLHUP on the host is
+ * been closed. In all cases except MIC card crash EPOLLHUP on the host is
 * triggered by the client's endpoint being closed.
 */
 static void cosm_scif_close(struct cosm_device *cdev)
@@ -252,7 +252,7 @@ void cosm_scif_work(struct work_struct *work)
        while (1) {
                pollepd.epd = cdev->epd;
-                pollepd.events = POLLIN;
+                pollepd.events = EPOLLIN;
                /* Drop the mutex before blocking in scif_poll(..) */
                mutex_unlock(&cdev->cosm_mutex);
@@ -266,11 +266,11 @@ void cosm_scif_work(struct work_struct *work)
                }
                /* There is a message from the card */
-                if (pollepd.revents & POLLIN)
+                if (pollepd.revents & EPOLLIN)
                        cosm_scif_recv(cdev);
                /* The peer endpoint is closed or this endpoint disconnected */
-                if (pollepd.revents & POLLHUP) {
+                if (pollepd.revents & EPOLLHUP) {
                        cosm_scif_close(cdev);
                        break;
                }
diff --git a/drivers/misc/mic/cosm_client/cosm_scif_client.c b/drivers/misc/mic/cosm_client/cosm_scif_client.c
index aa530fcceaa9..beafc0da4027 100644
--- a/drivers/misc/mic/cosm_client/cosm_scif_client.c
+++ b/drivers/misc/mic/cosm_client/cosm_scif_client.c
@@ -160,7 +160,7 @@ static int cosm_scif_client(void *unused)
        while (!kthread_should_stop()) {
                pollepd.epd = client_epd;
-                pollepd.events = POLLIN;
+                pollepd.events = EPOLLIN;
                rc = scif_poll(&pollepd, 1, COSM_HEARTBEAT_SEND_MSEC);
                if (rc < 0) {
@@ -171,7 +171,7 @@ static int cosm_scif_client(void *unused)
                        continue;
                }
-                if (pollepd.revents & POLLIN)
+                if (pollepd.revents & EPOLLIN)
                        cosm_client_recv();
                msg.id = COSM_MSG_HEARTBEAT;
diff --git a/drivers/misc/mic/scif/scif_api.c b/drivers/misc/mic/scif/scif_api.c
index 8a3e48ec37dd..7b2dddcdd46d 100644
--- a/drivers/misc/mic/scif/scif_api.c
+++ b/drivers/misc/mic/scif/scif_api.c
@@ -1328,7 +1328,7 @@ __scif_pollfd(struct file *f, poll_table *wait, struct scif_endpt *ep)
                        if (ep->state == SCIFEP_CONNECTED ||
                            ep->state == SCIFEP_DISCONNECTED ||
                            ep->conn_err)
-                                mask |= POLLOUT;
+                                mask |= EPOLLOUT;
                        goto exit;
                }
        }
@@ -1338,34 +1338,34 @@ __scif_pollfd(struct file *f, poll_table *wait, struct scif_endpt *ep)
                _scif_poll_wait(f, &ep->conwq, wait, ep);
                if (ep->state == SCIFEP_LISTENING) {
                        if (ep->conreqcnt)
-                                mask |= POLLIN;
+                                mask |= EPOLLIN;
                        goto exit;
                }
        }
        /* Endpoint is connected or disconnected */
        if (ep->state == SCIFEP_CONNECTED || ep->state == SCIFEP_DISCONNECTED) {
-                if (poll_requested_events(wait) & POLLIN)
+                if (poll_requested_events(wait) & EPOLLIN)
                        _scif_poll_wait(f, &ep->recvwq, wait, ep);
-                if (poll_requested_events(wait) & POLLOUT)
+                if (poll_requested_events(wait) & EPOLLOUT)
                        _scif_poll_wait(f, &ep->sendwq, wait, ep);
                if (ep->state == SCIFEP_CONNECTED ||
                    ep->state == SCIFEP_DISCONNECTED) {
                        /* Data can be read without blocking */
                        if (scif_rb_count(&ep->qp_info.qp->inbound_q, 1))
-                                mask |= POLLIN;
+                                mask |= EPOLLIN;
                        /* Data can be written without blocking */
                        if (scif_rb_space(&ep->qp_info.qp->outbound_q))
-                                mask |= POLLOUT;
+                                mask |= EPOLLOUT;
-                        /* Return POLLHUP if endpoint is disconnected */
+                        /* Return EPOLLHUP if endpoint is disconnected */
                        if (ep->state == SCIFEP_DISCONNECTED)
-                                mask |= POLLHUP;
+                                mask |= EPOLLHUP;
                        goto exit;
                }
        }
-        /* Return POLLERR if the endpoint is in none of the above states */
+        /* Return EPOLLERR if the endpoint is in none of the above states */
-        mask |= POLLERR;
+        mask |= EPOLLERR;
 exit:
        spin_unlock(&ep->lock);
        return mask;
@@ -1398,10 +1398,10 @@ scif_poll(struct scif_pollepd *ufds, unsigned int nfds, long timeout_msecs)
        pt = &table.pt;
        while (1) {
                for (i = 0; i < nfds; i++) {
-                        pt->_key = ufds[i].events | POLLERR | POLLHUP;
+                        pt->_key = ufds[i].events | EPOLLERR | EPOLLHUP;
                        mask = __scif_pollfd(ufds[i].epd->anon,
                                             pt, ufds[i].epd);
-                        mask &= ufds[i].events | POLLERR | POLLHUP;
+                        mask &= ufds[i].events | EPOLLERR | EPOLLHUP;
                        if (mask) {
                                count++;
                                pt->_qproc = NULL;
diff --git a/drivers/misc/mic/vop/vop_vringh.c b/drivers/misc/mic/vop/vop_vringh.c
index 01d1f2ba7bb8..cbc8ebcff5cf 100644
--- a/drivers/misc/mic/vop/vop_vringh.c
+++ b/drivers/misc/mic/vop/vop_vringh.c
@@ -1010,7 +1010,7 @@ __unlock_ret:
 }
 /*
- * We return POLLIN | POLLOUT from poll when new buffers are enqueued, and
+ * We return EPOLLIN | EPOLLOUT from poll when new buffers are enqueued, and
 * not when previously enqueued buffers may be available. This means that
 * in the card->host (TX) path, when userspace is unblocked by poll it
 * must drain all available descriptors or it can stall.
@@ -1022,15 +1022,15 @@ static __poll_t vop_poll(struct file *f, poll_table *wait)
        mutex_lock(&vdev->vdev_mutex);
        if (vop_vdev_inited(vdev)) {
-                mask = POLLERR;
+                mask = EPOLLERR;
                goto done;
        }
        poll_wait(f, &vdev->waitq, wait);
        if (vop_vdev_inited(vdev)) {
-                mask = POLLERR;
+                mask = EPOLLERR;
        } else if (vdev->poll_wake) {
                vdev->poll_wake = 0;
-                mask = POLLIN | POLLOUT;
+                mask = EPOLLIN | EPOLLOUT;
        }
 done:
        mutex_unlock(&vdev->vdev_mutex);
diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
index c90c1a578d2f..d9aa407db06a 100644
--- a/drivers/misc/ocxl/file.c
+++ b/drivers/misc/ocxl/file.c
@@ -215,9 +215,9 @@ static unsigned int afu_poll(struct file *file, struct poll_table_struct *wait)
        mutex_unlock(&ctx->status_mutex);
        if (afu_events_pending(ctx))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        else if (closed)
-                mask = POLLERR;
+                mask = EPOLLERR;
        return mask;
 }
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c
index 8fa68cf308e0..b084245f6238 100644
--- a/drivers/misc/phantom.c
+++ b/drivers/misc/phantom.c
@@ -265,9 +265,9 @@ static __poll_t phantom_poll(struct file *file, poll_table *wait)
        poll_wait(file, &dev->wait, wait);
        if (!(dev->status & PHB_RUNNING))
-                mask = POLLERR;
+                mask = EPOLLERR;
        else if (atomic_read(&dev->counter))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        pr_debug("phantom_poll end: %x/%d\n", mask, atomic_read(&dev->counter));
diff --git a/drivers/misc/vmw_vmci/vmci_host.c b/drivers/misc/vmw_vmci/vmci_host.c
index 6640e7651533..83e0c95d20a4 100644
--- a/drivers/misc/vmw_vmci/vmci_host.c
+++ b/drivers/misc/vmw_vmci/vmci_host.c
@@ -182,7 +182,7 @@ static __poll_t vmci_host_poll(struct file *filp, poll_table *wait)
                if (context->pending_datagrams > 0 ||
                    vmci_handle_arr_get_size(
                                context->pending_doorbell_array) > 0) {
-                        mask = POLLIN;
+                        mask = EPOLLIN;
                }
                spin_unlock(&context->lock);
        }
diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c
index e412dfdda7dd..377af43b81b3 100644
--- a/drivers/net/ieee802154/ca8210.c
+++ b/drivers/net/ieee802154/ca8210.c
@@ -2648,11 +2648,11 @@ static __poll_t ca8210_test_int_poll(
        poll_wait(filp, &priv->test.readq, ptable);
        if (!kfifo_is_empty(&priv->test.up_fifo))
-                return_flags |= (POLLIN | POLLRDNORM);
+                return_flags |= (EPOLLIN | EPOLLRDNORM);
        if (wait_event_interruptible(
                priv->test.readq,
                !kfifo_is_empty(&priv->test.up_fifo))) {
-                return POLLERR;
+                return EPOLLERR;
        }
        return return_flags;
 }
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
index ef6b2126b23a..255a5def56e9 100644
--- a/drivers/net/ppp/ppp_generic.c
+++ b/drivers/net/ppp/ppp_generic.c
@@ -539,11 +539,11 @@ static __poll_t ppp_poll(struct file *file, poll_table *wait)
        if (!pf)
                return 0;
        poll_wait(file, &pf->rwait, wait);
-        mask = POLLOUT | POLLWRNORM;
+        mask = EPOLLOUT | EPOLLWRNORM;
        if (skb_peek(&pf->rq))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (pf->dead)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        else if (pf->kind == INTERFACE) {
                /* see comment in ppp_read */
                struct ppp *ppp = PF_TO_PPP(pf);
@@ -551,7 +551,7 @@ static __poll_t ppp_poll(struct file *file, poll_table *wait)
                ppp_recv_lock(ppp);
                if (ppp->n_channels == 0 &&
                    (ppp->flags & SC_LOOP_TRAFFIC) == 0)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                ppp_recv_unlock(ppp);
        }
diff --git a/drivers/net/tap.c b/drivers/net/tap.c
index 0a5ed004781c..9b6cb780affe 100644
--- a/drivers/net/tap.c
+++ b/drivers/net/tap.c
@@ -377,7 +377,7 @@ rx_handler_result_t tap_handle_frame(struct sk_buff **pskb)
        }
 wake_up:
-        wake_up_interruptible_poll(sk_sleep(&q->sk), POLLIN | POLLRDNORM | POLLRDBAND);
+        wake_up_interruptible_poll(sk_sleep(&q->sk), EPOLLIN | EPOLLRDNORM | EPOLLRDBAND);
        return RX_HANDLER_CONSUMED;
 drop:
@@ -487,7 +487,7 @@ static void tap_sock_write_space(struct sock *sk)
        wqueue = sk_sleep(sk);
        if (wqueue && waitqueue_active(wqueue))
-                wake_up_interruptible_poll(wqueue, POLLOUT | POLLWRNORM | POLLWRBAND);
+                wake_up_interruptible_poll(wqueue, EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND);
 }
 static void tap_sock_destruct(struct sock *sk)
@@ -572,7 +572,7 @@ static int tap_release(struct inode *inode, struct file *file)
 static __poll_t tap_poll(struct file *file, poll_table *wait)
 {
        struct tap_queue *q = file->private_data;
-        __poll_t mask = POLLERR;
+        __poll_t mask = EPOLLERR;
        if (!q)
                goto out;
@@ -581,12 +581,12 @@ static __poll_t tap_poll(struct file *file, poll_table *wait)
        poll_wait(file, &q->wq.wait, wait);
        if (!ptr_ring_empty(&q->ring))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (sock_writeable(&q->sk) ||
            (!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &q->sock.flags) &&
             sock_writeable(&q->sk)))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
 out:
        return mask;
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 17e496b88f81..81e6cc951e7f 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1437,7 +1437,7 @@ static __poll_t tun_chr_poll(struct file *file, poll_table *wait)
        __poll_t mask = 0;
        if (!tun)
-                return POLLERR;
+                return EPOLLERR;
        sk = tfile->socket.sk;
@@ -1446,16 +1446,16 @@ static __poll_t tun_chr_poll(struct file *file, poll_table *wait)
        poll_wait(file, sk_sleep(sk), wait);
        if (!ptr_ring_empty(&tfile->tx_ring))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (tun->dev->flags & IFF_UP &&
            (sock_writeable(sk) ||
             (!test_and_set_bit(SOCKWQ_ASYNC_NOSPACE, &sk->sk_socket->flags) &&
              sock_writeable(sk))))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        if (tun->dev->reg_state != NETREG_REGISTERED)
-                mask = POLLERR;
+                mask = EPOLLERR;
        tun_put(tun);
        return mask;
@@ -2310,8 +2310,8 @@ static void tun_sock_write_space(struct sock *sk)
        wqueue = sk_sleep(sk);
        if (wqueue && waitqueue_active(wqueue))
-                wake_up_interruptible_sync_poll(wqueue, POLLOUT |
+                wake_up_interruptible_sync_poll(wqueue, EPOLLOUT |
-                                                POLLWRNORM | POLLWRBAND);
+                                                EPOLLWRNORM | EPOLLWRBAND);
        tfile = container_of(sk, struct tun_file, sk);
        kill_fasync(&tfile->fasync, SIGIO, POLL_OUT);
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
index 72c55d1f8903..ac2572943ed0 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00debug.c
@@ -309,7 +309,7 @@ static __poll_t rt2x00debug_poll_queue_dump(struct file *file,
        poll_wait(file, &intf->frame_dump_waitqueue, wait);
        if (!skb_queue_empty(&intf->frame_dump_skbqueue))
-                return POLLOUT | POLLWRNORM;
+                return EPOLLOUT | EPOLLWRNORM;
        return 0;
 }
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index a60c0ab7883d..47cd0c037433 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -511,15 +511,15 @@ static __poll_t switchtec_dev_poll(struct file *filp, poll_table *wait)
        poll_wait(filp, &stdev->event_wq, wait);
        if (lock_mutex_and_test_alive(stdev))
-                return POLLIN | POLLRDHUP | POLLOUT | POLLERR | POLLHUP;
+                return EPOLLIN | EPOLLRDHUP | EPOLLOUT | EPOLLERR | EPOLLHUP;
        mutex_unlock(&stdev->mrpc_mutex);
        if (try_wait_for_completion(&stuser->comp))
-                ret |= POLLIN | POLLRDNORM;
+                ret |= EPOLLIN | EPOLLRDNORM;
        if (stuser->event_cnt != atomic_read(&stdev->event_cnt))
-                ret |= POLLPRI | POLLRDBAND;
+                ret |= EPOLLPRI | EPOLLRDBAND;
        return ret;
 }
diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 5473e602f7e0..0e88e18362c1 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -200,7 +200,7 @@ static __poll_t cros_ec_console_log_poll(struct file *file,
        if (CIRC_CNT(debug_info->log_buffer.head,
                     debug_info->log_buffer.tail,
                     LOG_SIZE))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        mutex_unlock(&debug_info->log_mutex);
        return mask;
diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
index 999f1152655a..3e32a4c14d5f 100644
--- a/drivers/platform/goldfish/goldfish_pipe.c
+++ b/drivers/platform/goldfish/goldfish_pipe.c
@@ -549,13 +549,13 @@ static __poll_t goldfish_pipe_poll(struct file *filp, poll_table *wait)
                return -ERESTARTSYS;
        if (status & PIPE_POLL_IN)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (status & PIPE_POLL_OUT)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        if (status & PIPE_POLL_HUP)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (test_bit(BIT_CLOSED_ON_HOST, &pipe->flags))
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        return mask;
 }
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index a4fabf9d75f3..b205b037fd61 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -4128,7 +4128,7 @@ static __poll_t sonypi_misc_poll(struct file *file, poll_table *wait)
 {
        poll_wait(file, &sonypi_compat.fifo_proc_list, wait);
        if (kfifo_len(&sonypi_compat.fifo))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index 1d42385b1aa5..8febacb8fc54 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -55,7 +55,7 @@ static __poll_t pps_cdev_poll(struct file *file, poll_table *wait)
        poll_wait(file, &pps->queue, wait);
-        return POLLIN | POLLRDNORM;
+        return EPOLLIN | EPOLLRDNORM;
 }
 static int pps_cdev_fasync(int fd, struct file *file, int on)
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index a593b4cf47bf..767c485af59b 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -286,7 +286,7 @@ __poll_t ptp_poll(struct posix_clock *pc, struct file *fp, poll_table *wait)
        poll_wait(fp, &ptp->tsev_wq, wait);
-        return queue_cnt(&ptp->tsevq) ? POLLIN : 0;
+        return queue_cnt(&ptp->tsevq) ? EPOLLIN : 0;
 }
 #define EXTTS_BUFSIZE (PTP_BUF_TIMESTAMPS * sizeof(struct ptp_extts_event))
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index 6092b3a5978e..cfb54e01d758 100644
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -2325,7 +2325,7 @@ static __poll_t mport_cdev_poll(struct file *filp, poll_table *wait)
        poll_wait(filp, &priv->event_rx_wait, wait);
        if (kfifo_len(&priv->event_fifo))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 8428eba8cb73..92d0c6a7a837 100644
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -967,7 +967,7 @@ static __poll_t qcom_smd_poll(struct rpmsg_endpoint *ept,
        poll_wait(filp, &channel->fblockread_event, wait);
        if (qcom_smd_get_tx_avail(channel) > 20)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/drivers/rpmsg/rpmsg_char.c b/drivers/rpmsg/rpmsg_char.c
index e622fcda30fa..64b6de9763ee 100644
--- a/drivers/rpmsg/rpmsg_char.c
+++ b/drivers/rpmsg/rpmsg_char.c
@@ -262,12 +262,12 @@ static __poll_t rpmsg_eptdev_poll(struct file *filp, poll_table *wait)
        __poll_t mask = 0;
        if (!eptdev->ept)
-                return POLLERR;
+                return EPOLLERR;
        poll_wait(filp, &eptdev->readq, wait);
        if (!skb_queue_empty(&eptdev->queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        mask |= rpmsg_poll(eptdev->ept, filp, wait);
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index 5a7b30d0773b..efa221e8bc22 100644
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -203,7 +203,7 @@ static __poll_t rtc_dev_poll(struct file *file, poll_table *wait)
        data = rtc->irq_data;
-        return (data != 0) ? (POLLIN | POLLRDNORM) : 0;
+        return (data != 0) ? (EPOLLIN | EPOLLRDNORM) : 0;
 }
 static long rtc_dev_ioctl(struct file *file,
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index 0c075d100252..fb2c3599d95c 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -671,7 +671,7 @@ static __poll_t dasd_eer_poll(struct file *filp, poll_table *ptable)
        poll_wait(filp, &dasd_eer_read_wait_queue, ptable);
        spin_lock_irqsave(&bufferlock, flags);
        if (eerb->head != eerb->tail)
-                mask = POLLIN | POLLRDNORM ;
+                mask = EPOLLIN | EPOLLRDNORM ;
        else
                mask = 0;
        spin_unlock_irqrestore(&bufferlock, flags);
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c
index 956f662908a6..7bc616b253f1 100644
--- a/drivers/s390/char/monreader.c
+++ b/drivers/s390/char/monreader.c
@@ -435,9 +435,9 @@ static __poll_t mon_poll(struct file *filp, struct poll_table_struct *p)
        poll_wait(filp, &mon_read_wait_queue, p);
        if (unlikely(atomic_read(&monpriv->iucv_severed)))
-                return POLLERR;
+                return EPOLLERR;
        if (atomic_read(&monpriv->read_ready))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 2791141bd035..a71ee67df084 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -7041,7 +7041,7 @@ static __poll_t megasas_mgmt_poll(struct file *file, poll_table *wait)
        poll_wait(file, &megasas_poll_wait, wait);
        spin_lock_irqsave(&poll_aen_lock, flags);
        if (megasas_poll_wait_aen)
-                mask = (POLLIN | POLLRDNORM);
+                mask = (EPOLLIN | EPOLLRDNORM);
        else
                mask = 0;
        megasas_poll_wait_aen = 0;
diff --git a/drivers/scsi/mpt3sas/mpt3sas_ctl.c b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
index 9cddc3074cd1..523971aeb4c1 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_ctl.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_ctl.c
@@ -546,7 +546,7 @@ _ctl_poll(struct file *filep, poll_table *wait)
        list_for_each_entry(ioc, &mpt3sas_ioc_list, list) {
                if (ioc->aen_event_read_flag) {
                        spin_unlock(&gioc_lock);
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
                }
        }
        spin_unlock(&gioc_lock);
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 0c434453aab3..c198b96368dd 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1152,27 +1152,27 @@ sg_poll(struct file *filp, poll_table * wait)
        sfp = filp->private_data;
        if (!sfp)
-                return POLLERR;
+                return EPOLLERR;
        sdp = sfp->parentdp;
        if (!sdp)
-                return POLLERR;
+                return EPOLLERR;
        poll_wait(filp, &sfp->read_wait, wait);
        read_lock_irqsave(&sfp->rq_list_lock, iflags);
        list_for_each_entry(srp, &sfp->rq_list, entry) {
                /* if any read waiting, flag it */
                if ((0 == res) && (1 == srp->done) && (!srp->sg_io_owned))
-                        res = POLLIN | POLLRDNORM;
+                        res = EPOLLIN | EPOLLRDNORM;
                ++count;
        }
        read_unlock_irqrestore(&sfp->rq_list_lock, iflags);
        if (atomic_read(&sdp->detaching))
-                res |= POLLHUP;
+                res |= EPOLLHUP;
        else if (!sfp->cmd_q) {
                if (0 == count)
-                        res |= POLLOUT | POLLWRNORM;
+                        res |= EPOLLOUT | EPOLLWRNORM;
        } else if (count < SG_MAX_QUEUE)
-                res |= POLLOUT | POLLWRNORM;
+                res |= EPOLLOUT | EPOLLWRNORM;
        SCSI_LOG_TIMEOUT(3, sg_printk(KERN_INFO, sdp,
                                      "sg_poll: res=0x%x\n", (__force u32) res));
        return res;
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index ef733847eebe..c13772a0df58 100644
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2288,7 +2288,7 @@ static __poll_t comedi_poll(struct file *file, poll_table *wait)
                if (s->busy != file || !comedi_is_subdevice_running(s) ||
                    (s->async->cmd.flags & CMDF_WRITE) ||
                    comedi_buf_read_n_available(s) > 0)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        s = comedi_file_write_subdevice(file);
@@ -2300,7 +2300,7 @@ static __poll_t comedi_poll(struct file *file, poll_table *wait)
                if (s->busy != file || !comedi_is_subdevice_running(s) ||
                    !(s->async->cmd.flags & CMDF_WRITE) ||
                    comedi_buf_write_n_available(s) >= bps)
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
 done:
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c
index ab69eeb2c1f1..b3f3b4a201af 100644
--- a/drivers/staging/comedi/drivers/serial2002.c
+++ b/drivers/staging/comedi/drivers/serial2002.c
@@ -114,8 +114,8 @@ static void serial2002_tty_read_poll_wait(struct file *f, int timeout)
                __poll_t mask;
                mask = f->f_op->poll(f, &table.pt);
-                if (mask & (POLLRDNORM | POLLRDBAND | POLLIN |
+                if (mask & (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN |
-                            POLLHUP | POLLERR)) {
+                            EPOLLHUP | EPOLLERR)) {
                        break;
                }
                now = ktime_get();
diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index 1993b03a6f2d..e8bfe5520bc7 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -37,7 +37,7 @@ module_param_named(loop, create_loop_dev, bool, 0644);
 /*
 * Threshold below which the tty is woken for writing
 * - should be equal to WAKEUP_CHARS in drivers/tty/n_tty.c because
- *   even if the writer is woken, n_tty_poll() won't set POLLOUT until
+ *   even if the writer is woken, n_tty_poll() won't set EPOLLOUT until
 *   our fifo is below this level
 */
 #define WAKEUP_CHARS             256
diff --git a/drivers/staging/greybus/tools/loopback_test.c b/drivers/staging/greybus/tools/loopback_test.c
index c51610ce24af..b82e2befe935 100644
--- a/drivers/staging/greybus/tools/loopback_test.c
+++ b/drivers/staging/greybus/tools/loopback_test.c
@@ -663,7 +663,7 @@ static int open_poll_files(struct loopback_test *t)
                        goto err;
                }
                read(t->fds[fds_idx].fd, &dummy, 1);
-                t->fds[fds_idx].events = POLLERR|POLLPRI;
+                t->fds[fds_idx].events = EPOLLERR|EPOLLPRI;
                t->fds[fds_idx].revents = 0;
                fds_idx++;
        }
@@ -756,7 +756,7 @@ static int wait_for_complete(struct loopback_test *t)
                }
                for (i = 0; i < t->poll_count; i++) {
-                        if (t->fds[i].revents & POLLPRI) {
+                        if (t->fds[i].revents & EPOLLPRI) {
                                /* Dummy read to clear the event */
                                read(t->fds[i].fd, &dummy, 1);
                                number_of_events++;
diff --git a/drivers/staging/irda/net/af_irda.c b/drivers/staging/irda/net/af_irda.c
index f1d128b2dae9..2f1e9ab3d6d0 100644
--- a/drivers/staging/irda/net/af_irda.c
+++ b/drivers/staging/irda/net/af_irda.c
@@ -1749,16 +1749,16 @@ static __poll_t irda_poll(struct file * file, struct socket *sock,
        /* Exceptional events? */
        if (sk->sk_err)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        if (sk->sk_shutdown & RCV_SHUTDOWN) {
                pr_debug("%s(), POLLHUP\n", __func__);
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        }
        /* Readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue)) {
                pr_debug("Socket is readable\n");
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        }
        /* Connection-based need to check for termination and startup */
@@ -1766,14 +1766,14 @@ static __poll_t irda_poll(struct file * file, struct socket *sock,
        case SOCK_STREAM:
                if (sk->sk_state == TCP_CLOSE) {
                        pr_debug("%s(), POLLHUP\n", __func__);
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                }
                if (sk->sk_state == TCP_ESTABLISHED) {
                        if ((self->tx_flow == FLOW_START) &&
                            sock_writeable(sk))
                        {
-                                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
                        }
                }
                break;
@@ -1781,12 +1781,12 @@ static __poll_t irda_poll(struct file * file, struct socket *sock,
                if ((self->tx_flow == FLOW_START) &&
                    sock_writeable(sk))
                {
-                        mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                        mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
                }
                break;
        case SOCK_DGRAM:
                if (sock_writeable(sk))
-                        mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                        mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
                break;
        default:
                break;
diff --git a/drivers/staging/irda/net/irnet/irnet_ppp.c b/drivers/staging/irda/net/irnet/irnet_ppp.c
index 75bf9e34311d..c90a158af4b7 100644
--- a/drivers/staging/irda/net/irnet/irnet_ppp.c
+++ b/drivers/staging/irda/net/irnet/irnet_ppp.c
@@ -429,10 +429,10 @@ irnet_ctrl_poll(irnet_socket *	ap,
  DENTER(CTRL_TRACE, "(ap=0x%p)\n", ap);
  poll_wait(file, &irnet_events.rwait, wait);
-  mask = POLLOUT | POLLWRNORM;
+  mask = EPOLLOUT | EPOLLWRNORM;
  /* If there is unread events */
  if(ap->event_index != irnet_events.index)
-    mask |= POLLIN | POLLRDNORM;
+    mask |= EPOLLIN | EPOLLRDNORM;
 #ifdef INITIAL_DISCOVERY
  if(ap->disco_number != -1)
    {
@@ -441,7 +441,7 @@ irnet_ctrl_poll(irnet_socket *	ap,
        irnet_get_discovery_log(ap);
      /* Recheck */
      if(ap->disco_number != -1)
-        mask |= POLLIN | POLLRDNORM;
+        mask |= EPOLLIN | EPOLLRDNORM;
    }
 #endif /* INITIAL_DISCOVERY */
@@ -618,7 +618,7 @@ dev_irnet_poll(struct file *	file,
  DENTER(FS_TRACE, "(file=0x%p, ap=0x%p)\n",
         file, ap);
-  mask = POLLOUT | POLLWRNORM;
+  mask = EPOLLOUT | EPOLLWRNORM;
  DABORT(ap == NULL, mask, FS_ERROR, "ap is NULL !!!\n");
  /* If we are connected to ppp_generic, let it handle the job */
diff --git a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
index 6657ebbe068a..4f9f9dca5e6a 100644
--- a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
+++ b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c
@@ -1265,7 +1265,7 @@ static __poll_t atomisp_poll(struct file *file,
        rt_mutex_lock(&isp->mutex);
        if (pipe->capq.streaming != 1) {
                rt_mutex_unlock(&isp->mutex);
-                return POLLERR;
+                return EPOLLERR;
        }
        rt_mutex_unlock(&isp->mutex);
diff --git a/drivers/staging/media/bcm2048/radio-bcm2048.c b/drivers/staging/media/bcm2048/radio-bcm2048.c
index 4ffff6f8b809..06d1920150da 100644
--- a/drivers/staging/media/bcm2048/radio-bcm2048.c
+++ b/drivers/staging/media/bcm2048/radio-bcm2048.c
@@ -2183,7 +2183,7 @@ static __poll_t bcm2048_fops_poll(struct file *file,
        poll_wait(file, &bdev->read_queue, pts);
        if (bdev->rds_data_available)
-                retval = POLLIN | POLLRDNORM;
+                retval = EPOLLIN | EPOLLRDNORM;
        return retval;
 }
diff --git a/drivers/staging/most/cdev/cdev.c b/drivers/staging/most/cdev/cdev.c
index c183489c4a1c..4d7fce8731fe 100644
--- a/drivers/staging/most/cdev/cdev.c
+++ b/drivers/staging/most/cdev/cdev.c
@@ -292,10 +292,10 @@ static __poll_t comp_poll(struct file *filp, poll_table *wait)
        if (c->cfg->direction == MOST_CH_RX) {
                if (!kfifo_is_empty(&c->fifo))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        } else {
                if (!kfifo_is_empty(&c->fifo) || ch_has_mbo(c))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
        return mask;
 }
diff --git a/drivers/staging/most/video/video.c b/drivers/staging/most/video/video.c
index ef23e8524b1e..9d7e747519d9 100644
--- a/drivers/staging/most/video/video.c
+++ b/drivers/staging/most/video/video.c
@@ -213,7 +213,7 @@ static __poll_t comp_vdev_poll(struct file *filp, poll_table *wait)
        if (!data_ready(mdev))
                poll_wait(filp, &mdev->wait_data, wait);
        if (data_ready(mdev))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/drivers/staging/speakup/speakup_soft.c b/drivers/staging/speakup/speakup_soft.c
index 0e74d09e18ea..0a1a7c259ab0 100644
--- a/drivers/staging/speakup/speakup_soft.c
+++ b/drivers/staging/speakup/speakup_soft.c
@@ -325,7 +325,7 @@ static __poll_t softsynth_poll(struct file *fp, struct poll_table_struct *wait)
        spin_lock_irqsave(&speakup_info.spinlock, flags);
        if (!synth_buffer_empty() || speakup_info.flushing)
-                ret = POLLIN | POLLRDNORM;
+                ret = EPOLLIN | EPOLLRDNORM;
        spin_unlock_irqrestore(&speakup_info.spinlock, flags);
        return ret;
 }
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 3b3af7e0ce1c..3b3e1f6632d7 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2477,11 +2477,11 @@ static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file,
        poll_wait(file, &tty->read_wait, wait);
        poll_wait(file, &tty->write_wait, wait);
        if (tty_hung_up_p(file))
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (!tty_is_writelocked(tty) && tty_write_room(tty) > 0)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        if (gsm->dead)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        return mask;
 }
diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c
index 929434ebee50..dabb391909aa 100644
--- a/drivers/tty/n_hdlc.c
+++ b/drivers/tty/n_hdlc.c
@@ -814,14 +814,14 @@ static __poll_t n_hdlc_tty_poll(struct tty_struct *tty, struct file *filp,
                /* set bits for operations that won't block */
                if (!list_empty(&n_hdlc->rx_buf_list.list))
-                        mask |= POLLIN | POLLRDNORM;    /* readable */
+                        mask |= EPOLLIN | EPOLLRDNORM;  /* readable */
                if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                if (tty_hung_up_p(filp))
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                if (!tty_is_writelocked(tty) &&
                                !list_empty(&n_hdlc->tx_free_buf_list.list))
-                        mask |= POLLOUT | POLLWRNORM;   /* writable */
+                        mask |= EPOLLOUT | EPOLLWRNORM; /* writable */
        }
        return mask;
 }       /* end of n_hdlc_tty_poll() */
diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c
index e81d3db8ad63..dbf1ab36758e 100644
--- a/drivers/tty/n_r3964.c
+++ b/drivers/tty/n_r3964.c
@@ -1223,7 +1223,7 @@ static __poll_t r3964_poll(struct tty_struct *tty, struct file *file,
        struct r3964_client_info *pClient;
        struct r3964_message *pMsg = NULL;
        unsigned long flags;
-        __poll_t result = POLLOUT;
+        __poll_t result = EPOLLOUT;
        TRACE_L("POLL");
@@ -1234,7 +1234,7 @@ static __poll_t r3964_poll(struct tty_struct *tty, struct file *file,
                pMsg = pClient->first_msg;
                spin_unlock_irqrestore(&pInfo->lock, flags);
                if (pMsg)
-                        result |= POLLIN | POLLRDNORM;
+                        result |= EPOLLIN | EPOLLRDNORM;
        } else {
                result = -EINVAL;
        }
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 478a9b40fd03..5c0e59e8fe46 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -1344,7 +1344,7 @@ handle_newline:
                        put_tty_queue(c, ldata);
                        smp_store_release(&ldata->canon_head, ldata->read_head);
                        kill_fasync(&tty->fasync, SIGIO, POLL_IN);
-                        wake_up_interruptible_poll(&tty->read_wait, POLLIN);
+                        wake_up_interruptible_poll(&tty->read_wait, EPOLLIN);
                        return 0;
                }
        }
@@ -1625,7 +1625,7 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
        if (read_cnt(ldata)) {
                kill_fasync(&tty->fasync, SIGIO, POLL_IN);
-                wake_up_interruptible_poll(&tty->read_wait, POLLIN);
+                wake_up_interruptible_poll(&tty->read_wait, EPOLLIN);
        }
 }
@@ -2376,22 +2376,22 @@ static __poll_t n_tty_poll(struct tty_struct *tty, struct file *file,
        poll_wait(file, &tty->read_wait, wait);
        poll_wait(file, &tty->write_wait, wait);
        if (input_available_p(tty, 1))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        else {
                tty_buffer_flush_work(tty->port);
                if (input_available_p(tty, 1))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        if (tty->packet && tty->link->ctrl_status)
-                mask |= POLLPRI | POLLIN | POLLRDNORM;
+                mask |= EPOLLPRI | EPOLLIN | EPOLLRDNORM;
        if (test_bit(TTY_OTHER_CLOSED, &tty->flags))
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (tty_hung_up_p(file))
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (tty->ops->write && !tty_is_writelocked(tty) &&
                        tty_chars_in_buffer(tty) < WAKEUP_CHARS &&
                        tty_write_room(tty) > 0)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 64338442050e..6c7151edd715 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -344,7 +344,7 @@ static void pty_start(struct tty_struct *tty)
                tty->ctrl_status &= ~TIOCPKT_STOP;
                tty->ctrl_status |= TIOCPKT_START;
                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                wake_up_interruptible_poll(&tty->link->read_wait, POLLIN);
+                wake_up_interruptible_poll(&tty->link->read_wait, EPOLLIN);
        }
 }
@@ -357,7 +357,7 @@ static void pty_stop(struct tty_struct *tty)
                tty->ctrl_status &= ~TIOCPKT_START;
                tty->ctrl_status |= TIOCPKT_STOP;
                spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                wake_up_interruptible_poll(&tty->link->read_wait, POLLIN);
+                wake_up_interruptible_poll(&tty->link->read_wait, EPOLLIN);
        }
 }
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 6a89835453d3..eb9133b472f4 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -445,7 +445,7 @@ static ssize_t hung_up_tty_write(struct file *file, const char __user *buf,
 /* No kernel lock held - none needed ;) */
 static __poll_t hung_up_tty_poll(struct file *filp, poll_table *wait)
 {
-        return POLLIN | POLLOUT | POLLERR | POLLHUP | POLLRDNORM | POLLWRNORM;
+        return EPOLLIN | EPOLLOUT | EPOLLERR | EPOLLHUP | EPOLLRDNORM | EPOLLWRNORM;
 }
 static long hung_up_tty_ioctl(struct file *file, unsigned int cmd,
@@ -533,7 +533,7 @@ void tty_wakeup(struct tty_struct *tty)
                        tty_ldisc_deref(ld);
                }
        }
-        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
+        wake_up_interruptible_poll(&tty->write_wait, EPOLLOUT);
 }
 EXPORT_SYMBOL_GPL(tty_wakeup);
@@ -867,7 +867,7 @@ static ssize_t tty_read(struct file *file, char __user *buf, size_t count,
 static void tty_write_unlock(struct tty_struct *tty)
 {
        mutex_unlock(&tty->atomic_write_lock);
-        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
+        wake_up_interruptible_poll(&tty->write_wait, EPOLLOUT);
 }
 static int tty_write_lock(struct tty_struct *tty, int ndelay)
@@ -1667,21 +1667,21 @@ int tty_release(struct inode *inode, struct file *filp)
                if (tty->count <= 1) {
                        if (waitqueue_active(&tty->read_wait)) {
-                                wake_up_poll(&tty->read_wait, POLLIN);
+                                wake_up_poll(&tty->read_wait, EPOLLIN);
                                do_sleep++;
                        }
                        if (waitqueue_active(&tty->write_wait)) {
-                                wake_up_poll(&tty->write_wait, POLLOUT);
+                                wake_up_poll(&tty->write_wait, EPOLLOUT);
                                do_sleep++;
                        }
                }
                if (o_tty && o_tty->count <= 1) {
                        if (waitqueue_active(&o_tty->read_wait)) {
-                                wake_up_poll(&o_tty->read_wait, POLLIN);
+                                wake_up_poll(&o_tty->read_wait, EPOLLIN);
                                do_sleep++;
                        }
                        if (waitqueue_active(&o_tty->write_wait)) {
-                                wake_up_poll(&o_tty->write_wait, POLLOUT);
+                                wake_up_poll(&o_tty->write_wait, EPOLLOUT);
                                do_sleep++;
                        }
                }
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 4e7946c0484b..050f4d650891 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -735,8 +735,8 @@ void tty_ldisc_hangup(struct tty_struct *tty, bool reinit)
                tty_ldisc_deref(ld);
        }
-        wake_up_interruptible_poll(&tty->write_wait, POLLOUT);
+        wake_up_interruptible_poll(&tty->write_wait, EPOLLOUT);
-        wake_up_interruptible_poll(&tty->read_wait, POLLIN);
+        wake_up_interruptible_poll(&tty->read_wait, EPOLLIN);
        /*
         * Shutdown the current line discipline, and reset it to
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 3e64ccd0040f..e4a66e1fd05f 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -563,7 +563,7 @@ static __poll_t
 vcs_poll(struct file *file, poll_table *wait)
 {
        struct vcs_poll_data *poll = vcs_poll_data_get(file);
-        __poll_t ret = DEFAULT_POLLMASK|POLLERR|POLLPRI;
+        __poll_t ret = DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;
        if (poll) {
                poll_wait(file, &poll->waitq, wait);
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
index 85bc1aaea4a4..fd4848392e0d 100644
--- a/drivers/uio/uio.c
+++ b/drivers/uio/uio.c
@@ -506,7 +506,7 @@ static __poll_t uio_poll(struct file *filep, poll_table *wait)
        poll_wait(filep, &idev->wait, wait);
        if (listener->event_count != atomic_read(&idev->event))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index 9627ea6ec3ae..a0d284ef3f40 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -603,16 +603,16 @@ static __poll_t wdm_poll(struct file *file, struct poll_table_struct *wait)
        spin_lock_irqsave(&desc->iuspin, flags);
        if (test_bit(WDM_DISCONNECTING, &desc->flags)) {
-                mask = POLLHUP | POLLERR;
+                mask = EPOLLHUP | EPOLLERR;
                spin_unlock_irqrestore(&desc->iuspin, flags);
                goto desc_out;
        }
        if (test_bit(WDM_READ, &desc->flags))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        if (desc->rerr || desc->werr)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        if (!test_bit(WDM_IN_USE, &desc->flags))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        spin_unlock_irqrestore(&desc->iuspin, flags);
        poll_wait(file, &desc->wait, wait);
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 425247b7f728..d058d7a31e7c 100644
--- a/drivers/usb/class/usblp.c
+++ b/drivers/usb/class/usblp.c
@@ -479,8 +479,8 @@ static __poll_t usblp_poll(struct file *file, struct poll_table_struct *wait)
        poll_wait(file, &usblp->rwait, wait);
        poll_wait(file, &usblp->wwait, wait);
        spin_lock_irqsave(&usblp->lock, flags);
-        ret = ((usblp->bidir && usblp->rcomplete) ? POLLIN  | POLLRDNORM : 0) |
+        ret = ((usblp->bidir && usblp->rcomplete) ? EPOLLIN  | EPOLLRDNORM : 0) |
-           ((usblp->no_paper || usblp->wcomplete) ? POLLOUT | POLLWRNORM : 0);
+           ((usblp->no_paper || usblp->wcomplete) ? EPOLLOUT | EPOLLWRNORM : 0);
        spin_unlock_irqrestore(&usblp->lock, flags);
        return ret;
 }
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 7ea67a55be10..bdb1de0c0cef 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1265,13 +1265,13 @@ static __poll_t usbtmc_poll(struct file *file, poll_table *wait)
        mutex_lock(&data->io_mutex);
        if (data->zombie) {
-                mask = POLLHUP | POLLERR;
+                mask = EPOLLHUP | EPOLLERR;
                goto no_poll;
        }
        poll_wait(file, &data->waitq, wait);
-        mask = (atomic_read(&data->srq_asserted)) ? POLLIN | POLLRDNORM : 0;
+        mask = (atomic_read(&data->srq_asserted)) ? EPOLLIN | EPOLLRDNORM : 0;
 no_poll:
        mutex_unlock(&data->io_mutex);
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
index e2cec448779e..3de3c750b5f6 100644
--- a/drivers/usb/core/devices.c
+++ b/drivers/usb/core/devices.c
@@ -632,7 +632,7 @@ static __poll_t usb_device_poll(struct file *file,
        event_count = atomic_read(&device_event.count);
        if (file->f_version != event_count) {
                file->f_version = event_count;
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        }
        return 0;
diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index bf00166cbee0..d526595bc959 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -2578,11 +2578,11 @@ static __poll_t usbdev_poll(struct file *file,
        poll_wait(file, &ps->wait, wait);
        if (file->f_mode & FMODE_WRITE && !list_empty(&ps->async_completed))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        if (!connected(ps))
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (list_empty(&ps->list))
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        return mask;
 }
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
index 67564725e371..8f2cf3baa19c 100644
--- a/drivers/usb/gadget/function/f_fs.c
+++ b/drivers/usb/gadget/function/f_fs.c
@@ -644,7 +644,7 @@ static long ffs_ep0_ioctl(struct file *file, unsigned code, unsigned long value)
 static __poll_t ffs_ep0_poll(struct file *file, poll_table *wait)
 {
        struct ffs_data *ffs = file->private_data;
-        __poll_t mask = POLLWRNORM;
+        __poll_t mask = EPOLLWRNORM;
        int ret;
        poll_wait(file, &ffs->ev.waitq, wait);
@@ -656,19 +656,19 @@ static __poll_t ffs_ep0_poll(struct file *file, poll_table *wait)
        switch (ffs->state) {
        case FFS_READ_DESCRIPTORS:
        case FFS_READ_STRINGS:
-                mask |= POLLOUT;
+                mask |= EPOLLOUT;
                break;
        case FFS_ACTIVE:
                switch (ffs->setup_state) {
                case FFS_NO_SETUP:
                        if (ffs->ev.count)
-                                mask |= POLLIN;
+                                mask |= EPOLLIN;
                        break;
                case FFS_SETUP_PENDING:
                case FFS_SETUP_CANCELLED:
-                        mask |= (POLLIN | POLLOUT);
+                        mask |= (EPOLLIN | EPOLLOUT);
                        break;
                }
        case FFS_CLOSING:
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index a73efb1c47d0..54e859dcb25c 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -422,10 +422,10 @@ static __poll_t f_hidg_poll(struct file *file, poll_table *wait)
        poll_wait(file, &hidg->write_queue, wait);
        if (WRITE_COND)
-                ret |= POLLOUT | POLLWRNORM;
+                ret |= EPOLLOUT | EPOLLWRNORM;
        if (READ_COND)
-                ret |= POLLIN | POLLRDNORM;
+                ret |= EPOLLIN | EPOLLRDNORM;
        return ret;
 }
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c
index 453578c4af69..d359efe06c76 100644
--- a/drivers/usb/gadget/function/f_printer.c
+++ b/drivers/usb/gadget/function/f_printer.c
@@ -698,11 +698,11 @@ printer_poll(struct file *fd, poll_table *wait)
        spin_lock_irqsave(&dev->lock, flags);
        if (likely(!list_empty(&dev->tx_reqs)))
-                status |= POLLOUT | POLLWRNORM;
+                status |= EPOLLOUT | EPOLLWRNORM;
        if (likely(dev->current_rx_bytes) ||
                        likely(!list_empty(&dev->rx_buffers)))
-                status |= POLLIN | POLLRDNORM;
+                status |= EPOLLIN | EPOLLRDNORM;
        spin_unlock_irqrestore(&dev->lock, flags);
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
index 5960e76f4c75..37ca0e669bd8 100644
--- a/drivers/usb/gadget/legacy/inode.c
+++ b/drivers/usb/gadget/legacy/inode.c
@@ -1225,16 +1225,16 @@ ep0_poll (struct file *fd, poll_table *wait)
       /* report fd mode change before acting on it */
       if (dev->setup_abort) {
               dev->setup_abort = 0;
-               mask = POLLHUP;
+               mask = EPOLLHUP;
               goto out;
       }
       if (dev->state == STATE_DEV_SETUP) {
               if (dev->setup_in || dev->setup_can_stall)
-                       mask = POLLOUT;
+                       mask = EPOLLOUT;
       } else {
               if (dev->ev_next != 0)
-                       mask = POLLIN;
+                       mask = EPOLLIN;
       }
 out:
       spin_unlock_irq(&dev->lock);
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
index 1fa00b35f4ad..8d33187ce2af 100644
--- a/drivers/usb/misc/iowarrior.c
+++ b/drivers/usb/misc/iowarrior.c
@@ -683,19 +683,19 @@ static __poll_t iowarrior_poll(struct file *file, poll_table * wait)
        __poll_t mask = 0;
        if (!dev->present)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        poll_wait(file, &dev->read_wait, wait);
        poll_wait(file, &dev->write_wait, wait);
        if (!dev->present)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        if (read_index(dev) != -1)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (atomic_read(&dev->write_busy) < MAX_WRITES_IN_FLIGHT)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/drivers/usb/misc/ldusb.c b/drivers/usb/misc/ldusb.c
index 074398c1e410..63b9e85dc0e9 100644
--- a/drivers/usb/misc/ldusb.c
+++ b/drivers/usb/misc/ldusb.c
@@ -417,15 +417,15 @@ static __poll_t ld_usb_poll(struct file *file, poll_table *wait)
        dev = file->private_data;
        if (!dev->intf)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        poll_wait(file, &dev->read_wait, wait);
        poll_wait(file, &dev->write_wait, wait);
        if (dev->ring_head != dev->ring_tail)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (!dev->interrupt_out_busy)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/drivers/usb/misc/legousbtower.c b/drivers/usb/misc/legousbtower.c
index 941c45028828..bf47bd8bc76f 100644
--- a/drivers/usb/misc/legousbtower.c
+++ b/drivers/usb/misc/legousbtower.c
@@ -517,17 +517,17 @@ static __poll_t tower_poll (struct file *file, poll_table *wait)
        dev = file->private_data;
        if (!dev->udev)
-                return POLLERR | POLLHUP;
+                return EPOLLERR | EPOLLHUP;
        poll_wait(file, &dev->read_wait, wait);
        poll_wait(file, &dev->write_wait, wait);
        tower_check_for_read_packet(dev);
        if (dev->read_packet_length > 0) {
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        }
        if (!dev->interrupt_out_busy) {
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        }
        return mask;
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c
index cc5b296bff3f..2761fad66b95 100644
--- a/drivers/usb/mon/mon_bin.c
+++ b/drivers/usb/mon/mon_bin.c
@@ -1203,7 +1203,7 @@ mon_bin_poll(struct file *file, struct poll_table_struct *wait)
        spin_lock_irqsave(&rp->b_lock, flags);
        if (!MON_RING_EMPTY(rp))
-                mask |= POLLIN | POLLRDNORM;    /* readable */
+                mask |= EPOLLIN | EPOLLRDNORM;    /* readable */
        spin_unlock_irqrestore(&rp->b_lock, flags);
        return mask;
 }
diff --git a/drivers/vfio/virqfd.c b/drivers/vfio/virqfd.c
index 8cc4b48ff127..085700f1be10 100644
--- a/drivers/vfio/virqfd.c
+++ b/drivers/vfio/virqfd.c
@@ -48,7 +48,7 @@ static int virqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void
        struct virqfd *virqfd = container_of(wait, struct virqfd, wait);
        __poll_t flags = key_to_poll(key);
-        if (flags & POLLIN) {
+        if (flags & EPOLLIN) {
                /* An event has been signaled, call function */
                if ((!virqfd->handler ||
                     virqfd->handler(virqfd->opaque, virqfd->data)) &&
@@ -56,7 +56,7 @@ static int virqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void
                        schedule_work(&virqfd->inject);
        }
-        if (flags & POLLHUP) {
+        if (flags & EPOLLHUP) {
                unsigned long flags;
                spin_lock_irqsave(&virqfd_lock, flags);
@@ -172,14 +172,14 @@ int vfio_virqfd_enable(void *opaque,
         * Check if there was an event already pending on the eventfd
         * before we registered and trigger it as if we didn't miss it.
         */
-        if (events & POLLIN) {
+        if (events & EPOLLIN) {
                if ((!handler || handler(opaque, data)) && thread)
                        schedule_work(&virqfd->inject);
        }
        /*
         * Do not drop the file until the irqfd is fully initialized,
-         * otherwise we might race against the POLLHUP.
+         * otherwise we might race against the EPOLLHUP.
         */
        fdput(irqfd);
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index c613d2e3d371..610cba276d47 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -952,8 +952,8 @@ static int vhost_net_open(struct inode *inode, struct file *f)
        }
        vhost_dev_init(dev, vqs, VHOST_NET_VQ_MAX);
-        vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, POLLOUT, dev);
+        vhost_poll_init(n->poll + VHOST_NET_VQ_TX, handle_tx_net, EPOLLOUT, dev);
-        vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, POLLIN, dev);
+        vhost_poll_init(n->poll + VHOST_NET_VQ_RX, handle_rx_net, EPOLLIN, dev);
        f->private_data = n;
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 2db5af8e8652..1b3e8d2d5c8b 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -211,7 +211,7 @@ int vhost_poll_start(struct vhost_poll *poll, struct file *file)
        mask = file->f_op->poll(file, &poll->table);
        if (mask)
                vhost_poll_wakeup(&poll->wait, 0, 0, poll_to_key(mask));
-        if (mask & POLLERR) {
+        if (mask & EPOLLERR) {
                if (poll->wqh)
                        remove_wait_queue(poll->wqh, &poll->wait);
                ret = -EINVAL;
@@ -440,7 +440,7 @@ void vhost_dev_init(struct vhost_dev *dev,
                vhost_vq_reset(dev, vq);
                if (vq->handle_kick)
                        vhost_poll_init(&vq->poll, vq->handle_kick,
-                                        POLLIN, dev);
+                                        EPOLLIN, dev);
        }
 }
 EXPORT_SYMBOL_GPL(vhost_dev_init);
@@ -630,7 +630,7 @@ void vhost_dev_cleanup(struct vhost_dev *dev)
        vhost_umem_clean(dev->iotlb);
        dev->iotlb = NULL;
        vhost_clear_msg(dev);
-        wake_up_interruptible_poll(&dev->wait, POLLIN | POLLRDNORM);
+        wake_up_interruptible_poll(&dev->wait, EPOLLIN | EPOLLRDNORM);
        WARN_ON(!llist_empty(&dev->work_list));
        if (dev->worker) {
                kthread_stop(dev->worker);
@@ -1057,7 +1057,7 @@ __poll_t vhost_chr_poll(struct file *file, struct vhost_dev *dev,
        poll_wait(file, &dev->wait, wait);
        if (!list_empty(&dev->read_list))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
@@ -2356,7 +2356,7 @@ void vhost_enqueue_msg(struct vhost_dev *dev, struct list_head *head,
        list_add_tail(&node->node, head);
        spin_unlock(&dev->iotlb_lock);
-        wake_up_interruptible_poll(&dev->wait, POLLIN | POLLRDNORM);
+        wake_up_interruptible_poll(&dev->wait, EPOLLIN | EPOLLRDNORM);
 }
 EXPORT_SYMBOL_GPL(vhost_enqueue_msg);
diff --git a/drivers/virt/fsl_hypervisor.c b/drivers/virt/fsl_hypervisor.c
index b0597bef4555..4e05d7f711fe 100644
--- a/drivers/virt/fsl_hypervisor.c
+++ b/drivers/virt/fsl_hypervisor.c
@@ -574,7 +574,7 @@ static __poll_t fsl_hv_poll(struct file *filp, struct poll_table_struct *p)
        spin_lock_irqsave(&dbq->lock, flags);
        poll_wait(filp, &dbq->wait, p);
-        mask = (dbq->head == dbq->tail) ? 0 : (POLLIN | POLLRDNORM);
+        mask = (dbq->head == dbq->tail) ? 0 : (EPOLLIN | EPOLLRDNORM);
        spin_unlock_irqrestore(&dbq->lock, flags);
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c
index 72c0416a01cc..8cac07ab60ab 100644
--- a/drivers/xen/evtchn.c
+++ b/drivers/xen/evtchn.c
@@ -623,14 +623,14 @@ static long evtchn_ioctl(struct file *file,
 static __poll_t evtchn_poll(struct file *file, poll_table *wait)
 {
-        __poll_t mask = POLLOUT | POLLWRNORM;
+        __poll_t mask = EPOLLOUT | EPOLLWRNORM;
        struct per_user_data *u = file->private_data;
        poll_wait(file, &u->evtchn_wait, wait);
        if (u->ring_cons != u->ring_prod)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (u->ring_overflow)
-                mask = POLLERR;
+                mask = EPOLLERR;
        return mask;
 }
diff --git a/drivers/xen/mcelog.c b/drivers/xen/mcelog.c
index 9ade533d9e40..262835ace35d 100644
--- a/drivers/xen/mcelog.c
+++ b/drivers/xen/mcelog.c
@@ -144,7 +144,7 @@ static __poll_t xen_mce_chrdev_poll(struct file *file, poll_table *wait)
        poll_wait(file, &xen_mce_chrdev_wait, wait);
        if (xen_mcelog.next)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/drivers/xen/pvcalls-front.c b/drivers/xen/pvcalls-front.c
index 78804e71f9a6..753d9cb437d0 100644
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@ -892,7 +892,7 @@ static __poll_t pvcalls_front_poll_passive(struct file *file,
                if (req_id != PVCALLS_INVALID_ID &&
                    READ_ONCE(bedata->rsp[req_id].req_id) == req_id)
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
                poll_wait(file, &map->passive.inflight_accept_req, wait);
                return 0;
@@ -900,7 +900,7 @@ static __poll_t pvcalls_front_poll_passive(struct file *file,
        if (test_and_clear_bit(PVCALLS_FLAG_POLL_RET,
                               (void *)&map->passive.flags))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        /*
         * First check RET, then INFLIGHT. No barriers necessary to
@@ -949,11 +949,11 @@ static __poll_t pvcalls_front_poll_active(struct file *file,
        poll_wait(file, &map->active.inflight_conn_req, wait);
        if (pvcalls_front_write_todo(map))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        if (pvcalls_front_read_todo(map))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (in_error != 0 || out_error != 0)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        return mask;
 }
@@ -968,14 +968,14 @@ __poll_t pvcalls_front_poll(struct file *file, struct socket *sock,
        pvcalls_enter();
        if (!pvcalls_front_dev) {
                pvcalls_exit();
-                return POLLNVAL;
+                return EPOLLNVAL;
        }
        bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
        map = (struct sock_mapping *) sock->sk->sk_send_head;
        if (!map) {
                pvcalls_exit();
-                return POLLNVAL;
+                return EPOLLNVAL;
        }
        if (map->active_socket)
                ret = pvcalls_front_poll_active(file, bedata, map, wait);
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c
index e17ec3fce590..a493e99bed21 100644
--- a/drivers/xen/xenbus/xenbus_dev_frontend.c
+++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -651,7 +651,7 @@ static __poll_t xenbus_file_poll(struct file *file, poll_table *wait)
        poll_wait(file, &u->read_waitq, wait);
        if (!list_empty(&u->read_buffers))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
index 7edbd0679952..3fdee214a5bb 100644
--- a/fs/cachefiles/daemon.c
+++ b/fs/cachefiles/daemon.c
@@ -289,7 +289,7 @@ found_command:
 /*
 * poll for culling state
- * - use POLLOUT to indicate culling state
+ * - use EPOLLOUT to indicate culling state
 */
 static __poll_t cachefiles_daemon_poll(struct file *file,
                                           struct poll_table_struct *poll)
@@ -301,10 +301,10 @@ static __poll_t cachefiles_daemon_poll(struct file *file,
        mask = 0;
        if (test_bit(CACHEFILES_STATE_CHANGED, &cache->flags))
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        if (test_bit(CACHEFILES_CULLING, &cache->flags))
-                mask |= POLLOUT;
+                mask |= EPOLLOUT;
        return mask;
 }
diff --git a/fs/coda/psdev.c b/fs/coda/psdev.c
index 80b9b84391a9..c5234c21b539 100644
--- a/fs/coda/psdev.c
+++ b/fs/coda/psdev.c
@@ -64,12 +64,12 @@ static struct class *coda_psdev_class;
 static __poll_t coda_psdev_poll(struct file *file, poll_table * wait)
 {
        struct venus_comm *vcp = (struct venus_comm *) file->private_data;
-        __poll_t mask = POLLOUT | POLLWRNORM;
+        __poll_t mask = EPOLLOUT | EPOLLWRNORM;
        poll_wait(file, &vcp->vc_waitq, wait);
        mutex_lock(&vcp->vc_mutex);
        if (!list_empty(&vcp->vc_pending))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        mutex_unlock(&vcp->vc_mutex);
        return mask;
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
index 20bb73a931dd..1f99678ff5d3 100644
--- a/fs/debugfs/file.c
+++ b/fs/debugfs/file.c
@@ -214,7 +214,7 @@ static __poll_t full_proxy_poll(struct file *filp,
        const struct file_operations *real_fops;
        if (debugfs_file_get(dentry))
-                return POLLHUP;
+                return EPOLLHUP;
        real_fops = debugfs_real_fops(filp);
        r = real_fops->poll(filp, wait);
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index a4c63e9e6385..c7d5a2ea3d03 100644
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -471,7 +471,7 @@ static __poll_t dev_poll(struct file *file, poll_table *wait)
        spin_lock(&ops_lock);
        if (!list_empty(&send_list))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        spin_unlock(&ops_lock);
        return mask;
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 662432af8ce8..2a669390cd7f 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -896,7 +896,7 @@ static __poll_t device_poll(struct file *file, poll_table *wait)
        spin_lock(&proc->asts_spin);
        if (!list_empty(&proc->asts)) {
                spin_unlock(&proc->asts_spin);
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        }
        spin_unlock(&proc->asts_spin);
        return 0;
diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
index 7423e792a092..2d1158e5f950 100644
--- a/fs/ecryptfs/miscdev.c
+++ b/fs/ecryptfs/miscdev.c
@@ -59,7 +59,7 @@ ecryptfs_miscdev_poll(struct file *file, poll_table *pt)
        poll_wait(file, &daemon->wait, pt);
        mutex_lock(&daemon->mux);
        if (!list_empty(&daemon->msg_ctx_out_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
 out_unlock_daemon:
        daemon->flags &= ~ECRYPTFS_DAEMON_IN_POLL;
        mutex_unlock(&daemon->mux);
diff --git a/fs/eventfd.c b/fs/eventfd.c
index 04fd824142a1..012f5bd46dfa 100644
--- a/fs/eventfd.c
+++ b/fs/eventfd.c
@@ -45,7 +45,7 @@ struct eventfd_ctx {
 *
 * This function is supposed to be called by the kernel in paths that do not
 * allow sleeping. In this function we allow the counter to reach the ULLONG_MAX
- * value, and we signal this as overflow condition by returning a POLLERR
+ * value, and we signal this as overflow condition by returning a EPOLLERR
 * to poll(2).
 *
 * Returns the amount by which the counter was incremented.  This will be less
@@ -60,7 +60,7 @@ __u64 eventfd_signal(struct eventfd_ctx *ctx, __u64 n)
                n = ULLONG_MAX - ctx->count;
        ctx->count += n;
        if (waitqueue_active(&ctx->wqh))
-                wake_up_locked_poll(&ctx->wqh, POLLIN);
+                wake_up_locked_poll(&ctx->wqh, EPOLLIN);
        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
        return n;
@@ -96,7 +96,7 @@ static int eventfd_release(struct inode *inode, struct file *file)
 {
        struct eventfd_ctx *ctx = file->private_data;
-        wake_up_poll(&ctx->wqh, POLLHUP);
+        wake_up_poll(&ctx->wqh, EPOLLHUP);
        eventfd_ctx_put(ctx);
        return 0;
 }
@@ -150,11 +150,11 @@ static __poll_t eventfd_poll(struct file *file, poll_table *wait)
        count = READ_ONCE(ctx->count);
        if (count > 0)
-                events |= POLLIN;
+                events |= EPOLLIN;
        if (count == ULLONG_MAX)
-                events |= POLLERR;
+                events |= EPOLLERR;
        if (ULLONG_MAX - 1 > count)
-                events |= POLLOUT;
+                events |= EPOLLOUT;
        return events;
 }
@@ -187,7 +187,7 @@ int eventfd_ctx_remove_wait_queue(struct eventfd_ctx *ctx, wait_queue_entry_t *w
        eventfd_ctx_do_read(ctx, cnt);
        __remove_wait_queue(&ctx->wqh, wait);
        if (*cnt != 0 && waitqueue_active(&ctx->wqh))
-                wake_up_locked_poll(&ctx->wqh, POLLOUT);
+                wake_up_locked_poll(&ctx->wqh, EPOLLOUT);
        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
        return *cnt != 0 ? 0 : -EAGAIN;
@@ -231,7 +231,7 @@ static ssize_t eventfd_read(struct file *file, char __user *buf, size_t count,
        if (likely(res > 0)) {
                eventfd_ctx_do_read(ctx, &ucnt);
                if (waitqueue_active(&ctx->wqh))
-                        wake_up_locked_poll(&ctx->wqh, POLLOUT);
+                        wake_up_locked_poll(&ctx->wqh, EPOLLOUT);
        }
        spin_unlock_irq(&ctx->wqh.lock);
@@ -281,7 +281,7 @@ static ssize_t eventfd_write(struct file *file, const char __user *buf, size_t c
        if (likely(res > 0)) {
                ctx->count += ucnt;
                if (waitqueue_active(&ctx->wqh))
-                        wake_up_locked_poll(&ctx->wqh, POLLIN);
+                        wake_up_locked_poll(&ctx->wqh, EPOLLIN);
        }
        spin_unlock_irq(&ctx->wqh.lock);
diff --git a/fs/eventpoll.c b/fs/eventpoll.c
index d1a490c7e6c3..0f3494ed3ed0 100644
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
@@ -95,9 +95,9 @@
 /* Epoll private bits inside the event mask */
 #define EP_PRIVATE_BITS (EPOLLWAKEUP | EPOLLONESHOT | EPOLLET | EPOLLEXCLUSIVE)
-#define EPOLLINOUT_BITS (POLLIN | POLLOUT)
+#define EPOLLINOUT_BITS (EPOLLIN | EPOLLOUT)
-#define EPOLLEXCLUSIVE_OK_BITS (EPOLLINOUT_BITS | POLLERR | POLLHUP | \
+#define EPOLLEXCLUSIVE_OK_BITS (EPOLLINOUT_BITS | EPOLLERR | EPOLLHUP | \
                                EPOLLWAKEUP | EPOLLET | EPOLLEXCLUSIVE)
 /* Maximum number of nesting allowed inside epoll sets */
@@ -555,7 +555,7 @@ static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests)
        wait_queue_head_t *wqueue = (wait_queue_head_t *)cookie;
        spin_lock_irqsave_nested(&wqueue->lock, flags, call_nests + 1);
-        wake_up_locked_poll(wqueue, POLLIN);
+        wake_up_locked_poll(wqueue, EPOLLIN);
        spin_unlock_irqrestore(&wqueue->lock, flags);
        return 0;
@@ -575,7 +575,7 @@ static void ep_poll_safewake(wait_queue_head_t *wq)
 static void ep_poll_safewake(wait_queue_head_t *wq)
 {
-        wake_up_poll(wq, POLLIN);
+        wake_up_poll(wq, EPOLLIN);
 }
 #endif
@@ -908,7 +908,7 @@ static __poll_t ep_read_events_proc(struct eventpoll *ep, struct list_head *head
        list_for_each_entry_safe(epi, tmp, head, rdllink) {
                if (ep_item_poll(epi, &pt, depth)) {
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
                } else {
                        /*
                         * Item has been dropped into the ready list by the poll
@@ -1181,12 +1181,12 @@ static int ep_poll_callback(wait_queue_entry_t *wait, unsigned mode, int sync, v
                if ((epi->event.events & EPOLLEXCLUSIVE) &&
                                        !(pollflags & POLLFREE)) {
                        switch (pollflags & EPOLLINOUT_BITS) {
-                        case POLLIN:
+                        case EPOLLIN:
-                                if (epi->event.events & POLLIN)
+                                if (epi->event.events & EPOLLIN)
                                        ewake = 1;
                                break;
-                        case POLLOUT:
+                        case EPOLLOUT:
-                                if (epi->event.events & POLLOUT)
+                                if (epi->event.events & EPOLLOUT)
                                        ewake = 1;
                                break;
                        case 0:
@@ -2105,7 +2105,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
        switch (op) {
        case EPOLL_CTL_ADD:
                if (!epi) {
-                        epds.events |= POLLERR | POLLHUP;
+                        epds.events |= EPOLLERR | EPOLLHUP;
                        error = ep_insert(ep, &epds, tf.file, fd, full_check);
                } else
                        error = -EEXIST;
@@ -2121,7 +2121,7 @@ SYSCALL_DEFINE4(epoll_ctl, int, epfd, int, op, int, fd,
        case EPOLL_CTL_MOD:
                if (epi) {
                        if (!(epi->event.events & EPOLLEXCLUSIVE)) {
-                                epds.events |= POLLERR | POLLHUP;
+                                epds.events |= EPOLLERR | EPOLLHUP;
                                error = ep_modify(ep, epi, &epds);
                        }
                } else
diff --git a/fs/fcntl.c b/fs/fcntl.c
index 4fc731876d6b..1e97f1fda90c 100644
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
@@ -691,12 +691,12 @@ COMPAT_SYSCALL_DEFINE3(fcntl, unsigned int, fd, unsigned int, cmd,
 /* Table to convert sigio signal codes into poll band bitmaps */
 static const __poll_t band_table[NSIGPOLL] = {
-        POLLIN | POLLRDNORM,                    /* POLL_IN */
+        EPOLLIN | EPOLLRDNORM,                  /* POLL_IN */
-        POLLOUT | POLLWRNORM | POLLWRBAND,      /* POLL_OUT */
+        EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND,   /* POLL_OUT */
-        POLLIN | POLLRDNORM | POLLMSG,          /* POLL_MSG */
+        EPOLLIN | EPOLLRDNORM | EPOLLMSG,               /* POLL_MSG */
-        POLLERR,                                /* POLL_ERR */
+        EPOLLERR,                               /* POLL_ERR */
-        POLLPRI | POLLRDBAND,                   /* POLL_PRI */
+        EPOLLPRI | EPOLLRDBAND,                 /* POLL_PRI */
-        POLLHUP | POLLERR                       /* POLL_HUP */
+        EPOLLHUP | EPOLLERR                     /* POLL_HUP */
 };
 static inline int sigio_perm(struct task_struct *p,
diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index aa089a6925d0..5d06384c2cae 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -2006,21 +2006,21 @@ out:
 static __poll_t fuse_dev_poll(struct file *file, poll_table *wait)
 {
-        __poll_t mask = POLLOUT | POLLWRNORM;
+        __poll_t mask = EPOLLOUT | EPOLLWRNORM;
        struct fuse_iqueue *fiq;
        struct fuse_dev *fud = fuse_get_dev(file);
        if (!fud)
-                return POLLERR;
+                return EPOLLERR;
        fiq = &fud->fc->iq;
        poll_wait(file, &fiq->waitq, wait);
        spin_lock(&fiq->waitq.lock);
        if (!fiq->connected)
-                mask = POLLERR;
+                mask = EPOLLERR;
        else if (request_pending(fiq))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        spin_unlock(&fiq->waitq.lock);
        return mask;
diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e85e974dd211..a201fb0ac64f 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2791,7 +2791,7 @@ __poll_t fuse_file_poll(struct file *file, poll_table *wait)
                fc->no_poll = 1;
                return DEFAULT_POLLMASK;
        }
-        return POLLERR;
+        return EPOLLERR;
 }
 EXPORT_SYMBOL_GPL(fuse_file_poll);
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index a03ce3422578..fd5ce883072e 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -823,7 +823,7 @@ void kernfs_drain_open_files(struct kernfs_node *kn)
 * the content and then you use 'poll' or 'select' to wait for
 * the content to change.  When the content changes (assuming the
 * manager for the kobject supports notification), poll will
- * return POLLERR|POLLPRI, and select will return the fd whether
+ * return EPOLLERR|EPOLLPRI, and select will return the fd whether
 * it is waiting for read, write, or exceptions.
 * Once poll/select indicates that the value has changed, you
 * need to close and re-open the file, or seek to 0 and read again.
@@ -851,7 +851,7 @@ static __poll_t kernfs_fop_poll(struct file *filp, poll_table *wait)
        return DEFAULT_POLLMASK;
 trigger:
-        return DEFAULT_POLLMASK|POLLERR|POLLPRI;
+        return DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;
 }
 static void kernfs_notify_workfn(struct work_struct *work)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index ef08d64c84b8..c07eb3d655ea 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -247,7 +247,7 @@ static __poll_t fanotify_poll(struct file *file, poll_table *wait)
        poll_wait(file, &group->notification_waitq, wait);
        spin_lock(&group->notification_lock);
        if (!fsnotify_notify_queue_is_empty(group))
-                ret = POLLIN | POLLRDNORM;
+                ret = EPOLLIN | EPOLLRDNORM;
        spin_unlock(&group->notification_lock);
        return ret;
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 5c29bf16814f..2c908b31d6c9 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -115,7 +115,7 @@ static __poll_t inotify_poll(struct file *file, poll_table *wait)
        poll_wait(file, &group->notification_waitq, wait);
        spin_lock(&group->notification_lock);
        if (!fsnotify_notify_queue_is_empty(group))
-                ret = POLLIN | POLLRDNORM;
+                ret = EPOLLIN | EPOLLRDNORM;
        spin_unlock(&group->notification_lock);
        return ret;
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c
index 385fcefa8bc5..602c71f32740 100644
--- a/fs/ocfs2/dlmfs/dlmfs.c
+++ b/fs/ocfs2/dlmfs/dlmfs.c
@@ -71,7 +71,7 @@ struct workqueue_struct *user_dlm_worker;
 * Over time, dlmfs has added some features that were not part of the
 * initial ABI.  Unfortunately, some of these features are not detectable
 * via standard usage.  For example, Linux's default poll always returns
- * POLLIN, so there is no way for a caller of poll(2) to know when dlmfs
+ * EPOLLIN, so there is no way for a caller of poll(2) to know when dlmfs
 * added poll support.  Instead, we provide this list of new capabilities.
 *
 * Capabilities is a read-only attribute.  We do it as a module parameter
@@ -83,7 +83,7 @@ struct workqueue_struct *user_dlm_worker;
 * interaction.
 *
 * Capabilities:
- * - bast       : POLLIN against the file descriptor of a held lock
+ * - bast       : EPOLLIN against the file descriptor of a held lock
 *                signifies a bast fired on the lock.
 */
 #define DLMFS_CAPABILITIES "bast stackglue"
@@ -230,7 +230,7 @@ static __poll_t dlmfs_file_poll(struct file *file, poll_table *wait)
        spin_lock(&ip->ip_lockres.l_lock);
        if (ip->ip_lockres.l_flags & USER_LOCK_BLOCKED)
-                event = POLLIN | POLLRDNORM;
+                event = EPOLLIN | EPOLLRDNORM;
        spin_unlock(&ip->ip_lockres.l_lock);
        return event;
diff --git a/fs/orangefs/devorangefs-req.c b/fs/orangefs/devorangefs-req.c
index f073cd9e6687..b03057afac2a 100644
--- a/fs/orangefs/devorangefs-req.c
+++ b/fs/orangefs/devorangefs-req.c
@@ -823,7 +823,7 @@ static __poll_t orangefs_devreq_poll(struct file *file,
        poll_wait(file, &orangefs_request_list_waitq, poll_table);
        if (!list_empty(&orangefs_request_list))
-                poll_revent_mask |= POLLIN;
+                poll_revent_mask |= EPOLLIN;
        return poll_revent_mask;
 }
diff --git a/fs/pipe.c b/fs/pipe.c
index 0913aed7fd0d..7b1954caf388 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -327,7 +327,7 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
                        break;
                }
                if (do_wakeup) {
-                        wake_up_interruptible_sync_poll(&pipe->wait, POLLOUT | POLLWRNORM);
+                        wake_up_interruptible_sync_poll(&pipe->wait, EPOLLOUT | EPOLLWRNORM);
                        kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
                }
                pipe_wait(pipe);
@@ -336,7 +336,7 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
        /* Signal writers asynchronously that there is more room. */
        if (do_wakeup) {
-                wake_up_interruptible_sync_poll(&pipe->wait, POLLOUT | POLLWRNORM);
+                wake_up_interruptible_sync_poll(&pipe->wait, EPOLLOUT | EPOLLWRNORM);
                kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
        }
        if (ret > 0)
@@ -463,7 +463,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
                        break;
                }
                if (do_wakeup) {
-                        wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLRDNORM);
+                        wake_up_interruptible_sync_poll(&pipe->wait, EPOLLIN | EPOLLRDNORM);
                        kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
                        do_wakeup = 0;
                }
@@ -474,7 +474,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
 out:
        __pipe_unlock(pipe);
        if (do_wakeup) {
-                wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLRDNORM);
+                wake_up_interruptible_sync_poll(&pipe->wait, EPOLLIN | EPOLLRDNORM);
                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
        }
        if (ret > 0 && sb_start_write_trylock(file_inode(filp)->i_sb)) {
@@ -523,19 +523,19 @@ pipe_poll(struct file *filp, poll_table *wait)
        nrbufs = pipe->nrbufs;
        mask = 0;
        if (filp->f_mode & FMODE_READ) {
-                mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
+                mask = (nrbufs > 0) ? EPOLLIN | EPOLLRDNORM : 0;
                if (!pipe->writers && filp->f_version != pipe->w_counter)
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
        }
        if (filp->f_mode & FMODE_WRITE) {
-                mask |= (nrbufs < pipe->buffers) ? POLLOUT | POLLWRNORM : 0;
+                mask |= (nrbufs < pipe->buffers) ? EPOLLOUT | EPOLLWRNORM : 0;
                /*
-                 * Most Unices do not set POLLERR for FIFOs but on Linux they
+                 * Most Unices do not set EPOLLERR for FIFOs but on Linux they
                 * behave exactly like pipes for poll().
                 */
                if (!pipe->readers)
-                        mask |= POLLERR;
+                        mask |= EPOLLERR;
        }
        return mask;
@@ -568,7 +568,7 @@ pipe_release(struct inode *inode, struct file *file)
                pipe->writers--;
        if (pipe->readers || pipe->writers) {
-                wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
+                wake_up_interruptible_sync_poll(&pipe->wait, EPOLLIN | EPOLLOUT | EPOLLRDNORM | EPOLLWRNORM | EPOLLERR | EPOLLHUP);
                kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
                kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
        }
@@ -936,7 +936,7 @@ static int fifo_open(struct inode *inode, struct file *filp)
                if (!is_pipe && !pipe->writers) {
                        if ((filp->f_flags & O_NONBLOCK)) {
-                                /* suppress POLLHUP until we have
+                                /* suppress EPOLLHUP until we have
                                 * seen a writer */
                                filp->f_version = pipe->w_counter;
                        } else {
diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index f0bfb45c3f9f..4f4a2abb225e 100644
--- 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 | EPOLLRDNORM;
        return 0;
 }
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index 63325377621a..c41ab261397d 100644
--- 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:
diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c
index c8528d587e09..e16fb8f2049e 100644
--- 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;
diff --git a/fs/select.c b/fs/select.c
index ec14171dd78a..b6c36254028a 100644
--- a/fs/select.c
+++ b/fs/select.c
@@ -432,9 +432,9 @@ get_max:
        return max;
 }
-#define POLLIN_SET (POLLRDNORM | POLLRDBAND | POLLIN | POLLHUP | POLLERR)
+#define POLLIN_SET (EPOLLRDNORM | EPOLLRDBAND | EPOLLIN | EPOLLHUP | EPOLLERR)
-#define POLLOUT_SET (POLLWRBAND | POLLWRNORM | POLLOUT | POLLERR)
+#define POLLOUT_SET (EPOLLWRBAND | EPOLLWRNORM | EPOLLOUT | EPOLLERR)
-#define POLLEX_SET (POLLPRI)
+#define POLLEX_SET (EPOLLPRI)
 static inline void wait_key_set(poll_table *wait, unsigned long in,
                                unsigned long out, unsigned long bit,
@@ -814,11 +814,11 @@ static inline __poll_t do_pollfd(struct pollfd *pollfd, poll_table *pwait,
        fd = pollfd->fd;
        if (fd >= 0) {
                struct fd f = fdget(fd);
-                mask = POLLNVAL;
+                mask = EPOLLNVAL;
                if (f.file) {
                        /* userland u16 ->events contains POLL... bitmap */
                        __poll_t filter = demangle_poll(pollfd->events) |
-                                                POLLERR | POLLHUP;
+                                                EPOLLERR | EPOLLHUP;
                        mask = DEFAULT_POLLMASK;
                        if (f.file->f_op->poll) {
                                pwait->_key = filter;
diff --git a/fs/signalfd.c b/fs/signalfd.c
index 31e923bec99a..9990957264e3 100644
--- a/fs/signalfd.c
+++ b/fs/signalfd.c
@@ -45,7 +45,7 @@ void signalfd_cleanup(struct sighand_struct *sighand)
                return;
        /* wait_queue_entry_t->func(POLLFREE) should do remove_wait_queue() */
-        wake_up_poll(wqh, POLLHUP | POLLFREE);
+        wake_up_poll(wqh, EPOLLHUP | POLLFREE);
 }
 struct signalfd_ctx {
@@ -69,7 +69,7 @@ static __poll_t signalfd_poll(struct file *file, poll_table *wait)
        if (next_signal(&current->pending, &ctx->sigmask) ||
            next_signal(&current->signal->shared_pending,
                        &ctx->sigmask))
-                events |= POLLIN;
+                events |= EPOLLIN;
        spin_unlock_irq(&current->sighand->siglock);
        return events;
diff --git a/fs/timerfd.c b/fs/timerfd.c
index 0510717f3a53..cdad49da3ff7 100644
--- 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 |= EPOLLIN;
        spin_unlock_irqrestore(&ctx->wqh.lock, flags);
        return events;
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c
index 87a13a7c8270..cec550c8468f 100644
--- a/fs/userfaultfd.c
+++ b/fs/userfaultfd.c
@@ -483,7 +483,7 @@ int handle_userfault(struct vm_fault *vmf, unsigned long reason)
        if (likely(must_wait && !READ_ONCE(ctx->released) &&
                   (return_to_userland ? !signal_pending(current) :
                    !fatal_signal_pending(current)))) {
-                wake_up_poll(&ctx->fd_wqh, POLLIN);
+                wake_up_poll(&ctx->fd_wqh, EPOLLIN);
                schedule();
                ret |= VM_FAULT_MAJOR;
@@ -614,7 +614,7 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx,
                spin_unlock(&ctx->event_wqh.lock);
-                wake_up_poll(&ctx->fd_wqh, POLLIN);
+                wake_up_poll(&ctx->fd_wqh, EPOLLIN);
                schedule();
                spin_lock(&ctx->event_wqh.lock);
@@ -904,7 +904,7 @@ wakeup:
        /* Flush pending events that may still wait on event_wqh */
        wake_up_all(&ctx->event_wqh);
-        wake_up_poll(&ctx->fd_wqh, POLLHUP);
+        wake_up_poll(&ctx->fd_wqh, EPOLLHUP);
        userfaultfd_ctx_put(ctx);
        return 0;
 }
@@ -949,14 +949,14 @@ static __poll_t userfaultfd_poll(struct file *file, poll_table *wait)
        switch (ctx->state) {
        case UFFD_STATE_WAIT_API:
-                return POLLERR;
+                return EPOLLERR;
        case UFFD_STATE_RUNNING:
                /*
                 * poll() never guarantees that read won't block.
                 * userfaults can be waken before they're read().
                 */
                if (unlikely(!(file->f_flags & O_NONBLOCK)))
-                        return POLLERR;
+                        return EPOLLERR;
                /*
                 * lockless access to see if there are pending faults
                 * __pollwait last action is the add_wait_queue but
@@ -970,14 +970,14 @@ static __poll_t userfaultfd_poll(struct file *file, poll_table *wait)
                ret = 0;
                smp_mb();
                if (waitqueue_active(&ctx->fault_pending_wqh))
-                        ret = POLLIN;
+                        ret = EPOLLIN;
                else if (waitqueue_active(&ctx->event_wqh))
-                        ret = POLLIN;
+                        ret = EPOLLIN;
                return ret;
        default:
                WARN_ON_ONCE(1);
-                return POLLERR;
+                return EPOLLERR;
        }
 }
diff --git a/include/linux/scif.h b/include/linux/scif.h
index 7046111b8d0a..eeb250b73c4b 100644
--- a/include/linux/scif.h
+++ b/include/linux/scif.h
@@ -1266,8 +1266,8 @@ int scif_put_pages(struct scif_range *pages);
 * events is a bitmask specifying the events which the application is
 * interested in. The field revents is an output parameter, filled by the
 * kernel with the events that actually occurred. The bits returned in revents
- * can include any of those specified in events, or one of the values POLLERR,
+ * can include any of those specified in events, or one of the values EPOLLERR,
- * POLLHUP, or POLLNVAL. (These three bits are meaningless in the events
+ * EPOLLHUP, or EPOLLNVAL. (These three bits are meaningless in the events
 * field, and will be set in the revents field whenever the corresponding
 * condition is true.)
 *
@@ -1279,20 +1279,20 @@ int scif_put_pages(struct scif_range *pages);
 * timeout means an infinite timeout.
 *
 * The following bits may be set in events and returned in revents.
- * POLLIN - Data may be received without blocking. For a connected
+ * EPOLLIN - Data may be received without blocking. For a connected
 * endpoint, this means that scif_recv() may be called without blocking. For a
 * listening endpoint, this means that scif_accept() may be called without
 * blocking.
- * POLLOUT - Data may be sent without blocking. For a connected endpoint, this
+ * EPOLLOUT - Data may be sent without blocking. For a connected endpoint, this
- * means that scif_send() may be called without blocking. POLLOUT may also be
+ * means that scif_send() may be called without blocking. EPOLLOUT may also be
 * used to block waiting for a non-blocking connect to complete. This bit value
 * has no meaning for a listening endpoint and is ignored if specified.
 *
 * The following bits are only returned in revents, and are ignored if set in
 * events.
- * POLLERR - An error occurred on the endpoint
+ * EPOLLERR - An error occurred on the endpoint
- * POLLHUP - The connection to the peer endpoint was disconnected
+ * EPOLLHUP - The connection to the peer endpoint was disconnected
- * POLLNVAL - The specified endpoint descriptor is invalid.
+ * EPOLLNVAL - The specified endpoint descriptor is invalid.
 *
 * Return:
 * Upon successful completion, scif_poll() returns a non-negative value. A
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index aa16c064294f..5b6c541e4e1b 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -443,7 +443,7 @@ struct vb2_buf_ops {
 * @fileio_read_once:           report EOF after reading the first buffer
 * @fileio_write_immediately:   queue buffer after each write() call
 * @allow_zero_bytesused:       allow bytesused == 0 to be passed to the driver
- * @quirk_poll_must_check_waiting_for_buffers: Return %POLLERR at poll when QBUF
+ * @quirk_poll_must_check_waiting_for_buffers: Return %EPOLLERR at poll when QBUF
 *              has not been called. This is a vb1 idiom that has been adopted
 *              also by vb2.
 * @lock:       pointer to a mutex that protects the &struct vb2_queue. The
@@ -493,7 +493,7 @@ struct vb2_buf_ops {
 * @error:      a fatal error occurred on the queue
 * @waiting_for_buffers: used in poll() to check if vb2 is still waiting for
 *              buffers. Only set for capture queues if qbuf has not yet been
- *              called since poll() needs to return %POLLERR in that situation.
+ *              called since poll() needs to return %EPOLLERR in that situation.
 * @is_multiplanar: set if buffer type is multiplanar
 * @is_output:  set if buffer type is output
 * @copy_timestamp: set if vb2-core should set timestamps
@@ -869,7 +869,7 @@ void vb2_core_queue_release(struct vb2_queue *q);
 * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * Flag that a fatal unrecoverable error has occurred and wake up all processes
- * waiting on the queue. Polling will now set %POLLERR and queuing and dequeuing
+ * waiting on the queue. Polling will now set %EPOLLERR and queuing and dequeuing
 * buffers will return %-EIO.
 *
 * The error flag will be cleared when canceling the queue, either from
diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
index 6692d67e9245..c1a93ce35e62 100644
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
@@ -310,7 +310,7 @@ void inet_csk_prepare_forced_close(struct sock *sk);
 static inline __poll_t inet_csk_listen_poll(const struct sock *sk)
 {
        return !reqsk_queue_empty(&inet_csk(sk)->icsk_accept_queue) ?
-                        (POLLIN | POLLRDNORM) : 0;
+                        (EPOLLIN | EPOLLRDNORM) : 0;
 }
 int inet_csk_listen_start(struct sock *sk, int backlog);
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 360e564ae7d1..d7f309f74dec 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -578,10 +578,10 @@ static __poll_t mqueue_poll_file(struct file *filp, struct poll_table_struct *po
        spin_lock(&info->lock);
        if (info->attr.mq_curmsgs)
-                retval = POLLIN | POLLRDNORM;
+                retval = EPOLLIN | EPOLLRDNORM;
        if (info->attr.mq_curmsgs < info->attr.mq_maxmsg)
-                retval |= POLLOUT | POLLWRNORM;
+                retval |= EPOLLOUT | EPOLLWRNORM;
        spin_unlock(&info->lock);
        return retval;
diff --git a/kernel/events/core.c b/kernel/events/core.c
index f0549e79978b..96db9ae5d5af 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4524,7 +4524,7 @@ static __poll_t perf_poll(struct file *file, poll_table *wait)
 {
        struct perf_event *event = file->private_data;
        struct ring_buffer *rb;
-        __poll_t events = POLLHUP;
+        __poll_t events = EPOLLHUP;
        poll_wait(file, &event->waitq, wait);
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 141aa2ca8728..6c6b3c48db71 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -19,7 +19,7 @@
 static void perf_output_wakeup(struct perf_output_handle *handle)
 {
-        atomic_set(&handle->rb->poll, POLLIN);
+        atomic_set(&handle->rb->poll, EPOLLIN);
        handle->event->pending_wakeup = 1;
        irq_work_queue(&handle->event->pending);
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index db4b9b8929eb..fc1123583fa6 100644
--- 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();
diff --git a/kernel/relay.c b/kernel/relay.c
index f7f40a6e6352..c3029402f15c 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -924,12 +924,12 @@ static __poll_t relay_file_poll(struct file *filp, poll_table *wait)
        struct rchan_buf *buf = filp->private_data;
        if (buf->finalized)
-                return POLLERR;
+                return EPOLLERR;
        if (filp->f_mode & FMODE_READ) {
                poll_wait(filp, &buf->read_wait, wait);
                if (!relay_buf_empty(buf))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        return mask;
diff --git a/kernel/time/posix-clock.c b/kernel/time/posix-clock.c
index 94ad46d50b56..fe56c4e06c51 100644
--- a/kernel/time/posix-clock.c
+++ b/kernel/time/posix-clock.c
@@ -74,7 +74,7 @@ static __poll_t posix_clock_poll(struct file *fp, poll_table *wait)
        __poll_t result = 0;
        if (!clk)
-                return POLLERR;
+                return EPOLLERR;
        if (clk->ops.poll)
                result = clk->ops.poll(clk, fp, wait);
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
index ca6930e0d25e..dcf1c4dd3efe 100644
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -627,7 +627,7 @@ int ring_buffer_wait(struct ring_buffer *buffer, int cpu, bool full)
 * as data is added to any of the @buffer's cpu buffers. Otherwise
 * it will wait for data to be added to a specific cpu buffer.
 *
- * Returns POLLIN | POLLRDNORM if data exists in the buffers,
+ * Returns EPOLLIN | EPOLLRDNORM if data exists in the buffers,
 * zero otherwise.
 */
 __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,
@@ -665,7 +665,7 @@ __poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu,
        if ((cpu == RING_BUFFER_ALL_CPUS && !ring_buffer_empty(buffer)) ||
            (cpu != RING_BUFFER_ALL_CPUS && !ring_buffer_empty_cpu(buffer, cpu)))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 56608538a4ad..20a2300ae4e8 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -5623,13 +5623,13 @@ trace_poll(struct trace_iterator *iter, struct file *filp, poll_table *poll_tabl
        /* Iterators are static, they should be filled or empty */
        if (trace_buffer_iter(iter, iter->cpu_file))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        if (tr->trace_flags & TRACE_ITER_BLOCK)
                /*
                 * Always select as readable when in blocking mode
                 */
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        else
                return ring_buffer_poll_wait(iter->trace_buffer->buffer, iter->cpu_file,
                                             filp, poll_table);
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 13b35ffa021e..670e99b68aa6 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3688,7 +3688,7 @@ static void memcg_event_remove(struct work_struct *work)
 }
 /*
- * Gets called on POLLHUP on eventfd when user closes it.
+ * Gets called on EPOLLHUP on eventfd when user closes it.
 *
 * Called with wqh->lock held and interrupts disabled.
 */
@@ -3700,7 +3700,7 @@ static int memcg_event_wake(wait_queue_entry_t *wait, unsigned mode,
        struct mem_cgroup *memcg = event->memcg;
        __poll_t flags = key_to_poll(key);
-        if (flags & POLLHUP) {
+        if (flags & EPOLLHUP) {
                /*
                 * If the event has been detached at cgroup removal, we
                 * can simply return knowing the other side will cleanup
diff --git a/mm/swapfile.c b/mm/swapfile.c
index 42fe5653814a..c7a33717d079 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2705,10 +2705,10 @@ static __poll_t swaps_poll(struct file *file, poll_table *wait)
        if (seq->poll_event != atomic_read(&proc_poll_event)) {
                seq->poll_event = atomic_read(&proc_poll_event);
-                return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
+                return EPOLLIN | EPOLLRDNORM | EPOLLERR | EPOLLPRI;
        }
-        return POLLIN | POLLRDNORM;
+        return EPOLLIN | EPOLLRDNORM;
 }
 /* iterator */
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
index d6f7f7cb79c4..0cfba919d167 100644
--- a/net/9p/trans_fd.c
+++ b/net/9p/trans_fd.c
@@ -240,7 +240,7 @@ p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt, int *err)
        if (!ts) {
                if (err)
                        *err = -EREMOTEIO;
-                return POLLERR;
+                return EPOLLERR;
        }
        if (!ts->rd->f_op->poll)
@@ -253,7 +253,7 @@ p9_fd_poll(struct p9_client *client, struct poll_table_struct *pt, int *err)
                        n = DEFAULT_POLLMASK;
                else
                        n = ts->wr->f_op->poll(ts->wr, pt);
-                ret = (ret & ~POLLOUT) | (n & ~POLLIN);
+                ret = (ret & ~EPOLLOUT) | (n & ~EPOLLIN);
        }
        return ret;
@@ -396,11 +396,11 @@ end_clear:
        if (!list_empty(&m->req_list)) {
                if (test_and_clear_bit(Rpending, &m->wsched))
-                        n = POLLIN;
+                        n = EPOLLIN;
                else
                        n = p9_fd_poll(m->client, NULL, NULL);
-                if ((n & POLLIN) && !test_and_set_bit(Rworksched, &m->wsched)) {
+                if ((n & EPOLLIN) && !test_and_set_bit(Rworksched, &m->wsched)) {
                        p9_debug(P9_DEBUG_TRANS, "sched read work %p\n", m);
                        schedule_work(&m->rq);
                }
@@ -505,11 +505,11 @@ end_clear:
        if (m->wsize || !list_empty(&m->unsent_req_list)) {
                if (test_and_clear_bit(Wpending, &m->wsched))
-                        n = POLLOUT;
+                        n = EPOLLOUT;
                else
                        n = p9_fd_poll(m->client, NULL, NULL);
-                if ((n & POLLOUT) &&
+                if ((n & EPOLLOUT) &&
                   !test_and_set_bit(Wworksched, &m->wsched)) {
                        p9_debug(P9_DEBUG_TRANS, "sched write work %p\n", m);
                        schedule_work(&m->wq);
@@ -599,12 +599,12 @@ static void p9_conn_create(struct p9_client *client)
        init_poll_funcptr(&m->pt, p9_pollwait);
        n = p9_fd_poll(client, &m->pt, NULL);
-        if (n & POLLIN) {
+        if (n & EPOLLIN) {
                p9_debug(P9_DEBUG_TRANS, "mux %p can read\n", m);
                set_bit(Rpending, &m->wsched);
        }
-        if (n & POLLOUT) {
+        if (n & EPOLLOUT) {
                p9_debug(P9_DEBUG_TRANS, "mux %p can write\n", m);
                set_bit(Wpending, &m->wsched);
        }
@@ -625,12 +625,12 @@ static void p9_poll_mux(struct p9_conn *m)
                return;
        n = p9_fd_poll(m->client, NULL, &err);
-        if (n & (POLLERR | POLLHUP | POLLNVAL)) {
+        if (n & (EPOLLERR | EPOLLHUP | EPOLLNVAL)) {
                p9_debug(P9_DEBUG_TRANS, "error mux %p err %d\n", m, n);
                p9_conn_cancel(m, err);
        }
-        if (n & POLLIN) {
+        if (n & EPOLLIN) {
                set_bit(Rpending, &m->wsched);
                p9_debug(P9_DEBUG_TRANS, "mux %p can read\n", m);
                if (!test_and_set_bit(Rworksched, &m->wsched)) {
@@ -639,7 +639,7 @@ static void p9_poll_mux(struct p9_conn *m)
                }
        }
-        if (n & POLLOUT) {
+        if (n & EPOLLOUT) {
                set_bit(Wpending, &m->wsched);
                p9_debug(P9_DEBUG_TRANS, "mux %p can write\n", m);
                if ((m->wsize || !list_empty(&m->unsent_req_list)) &&
@@ -678,11 +678,11 @@ static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)
        spin_unlock(&client->lock);
        if (test_and_clear_bit(Wpending, &m->wsched))
-                n = POLLOUT;
+                n = EPOLLOUT;
        else
                n = p9_fd_poll(m->client, NULL, NULL);
-        if (n & POLLOUT && !test_and_set_bit(Wworksched, &m->wsched))
+        if (n & EPOLLOUT && !test_and_set_bit(Wworksched, &m->wsched))
                schedule_work(&m->wq);
        return 0;
diff --git a/net/atm/common.c b/net/atm/common.c
index 6523f38c4957..fc78a0508ae1 100644
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -661,15 +661,15 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
        /* exceptional events */
        if (sk->sk_err)
-                mask = POLLERR;
+                mask = EPOLLERR;
        if (test_bit(ATM_VF_RELEASED, &vcc->flags) ||
            test_bit(ATM_VF_CLOSE, &vcc->flags))
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* writable? */
        if (sock->state == SS_CONNECTING &&
@@ -678,7 +678,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
        if (vcc->qos.txtp.traffic_class != ATM_NONE &&
            vcc_writable(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        return mask;
 }
diff --git a/net/batman-adv/icmp_socket.c b/net/batman-adv/icmp_socket.c
index 581375d0eed2..e91f29c7c638 100644
--- a/net/batman-adv/icmp_socket.c
+++ b/net/batman-adv/icmp_socket.c
@@ -304,7 +304,7 @@ static __poll_t batadv_socket_poll(struct file *file, poll_table *wait)
        poll_wait(file, &socket_client->queue_wait, wait);
        if (socket_client->queue_len > 0)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/net/batman-adv/log.c b/net/batman-adv/log.c
index 9be74a44e99d..dc9fa37ddd14 100644
--- a/net/batman-adv/log.c
+++ b/net/batman-adv/log.c
@@ -193,7 +193,7 @@ static __poll_t batadv_log_poll(struct file *file, poll_table *wait)
        poll_wait(file, &debug_log->queue_wait, wait);
        if (!batadv_log_empty(debug_log))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index f897681780db..84d92a077834 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -431,7 +431,7 @@ static inline __poll_t bt_accept_poll(struct sock *parent)
                if (sk->sk_state == BT_CONNECTED ||
                    (test_bit(BT_SK_DEFER_SETUP, &bt_sk(parent)->flags) &&
                     sk->sk_state == BT_CONNECT2))
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
        }
        return 0;
@@ -451,20 +451,20 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
                return bt_accept_poll(sk);
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
+                mask |= EPOLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (sk->sk_state == BT_CLOSED)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_state == BT_CONNECT ||
                        sk->sk_state == BT_CONNECT2 ||
@@ -472,7 +472,7 @@ __poll_t bt_sock_poll(struct file *file, struct socket *sock,
                return mask;
        if (!test_bit(BT_SK_SUSPEND, &bt_sk(sk)->flags) && sock_writeable(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        else
                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index b109445a1df9..a6fb1b3bcad9 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -924,7 +924,7 @@ static int caif_release(struct socket *sock)
        caif_disconnect_client(sock_net(sk), &cf_sk->layer);
        cf_sk->sk.sk_socket->state = SS_DISCONNECTING;
-        wake_up_interruptible_poll(sk_sleep(sk), POLLERR|POLLHUP);
+        wake_up_interruptible_poll(sk_sleep(sk), EPOLLERR|EPOLLHUP);
        sock_orphan(sk);
        sk_stream_kill_queues(&cf_sk->sk);
@@ -946,23 +946,23 @@ static __poll_t caif_poll(struct file *file,
        /* exceptional events? */
        if (sk->sk_err)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP;
+                mask |= EPOLLRDHUP;
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue) ||
                (sk->sk_shutdown & RCV_SHUTDOWN))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /*
         * we set writable also when the other side has shut down the
         * connection. This prevents stuck sockets.
         */
        if (sock_writeable(sk) && tx_flow_is_on(cf_sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        return mask;
 }
diff --git a/net/core/datagram.c b/net/core/datagram.c
index b7d9293940b5..9938952c5c78 100644
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -75,7 +75,7 @@ static int receiver_wake_function(wait_queue_entry_t *wait, unsigned int mode, i
        /*
         * Avoid a wakeup if event not interesting for us
         */
-        if (key && !(key_to_poll(key) & (POLLIN | POLLERR)))
+        if (key && !(key_to_poll(key) & (EPOLLIN | EPOLLERR)))
                return 0;
        return autoremove_wake_function(wait, mode, sync, key);
 }
@@ -842,22 +842,22 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
        /* exceptional events? */
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
+                mask |= EPOLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* Connection-based need to check for termination and startup */
        if (connection_based(sk)) {
                if (sk->sk_state == TCP_CLOSE)
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                /* connection hasn't started yet? */
                if (sk->sk_state == TCP_SYN_SENT)
                        return mask;
@@ -865,7 +865,7 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
        /* writable? */
        if (sock_writeable(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        else
                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
diff --git a/net/core/sock.c b/net/core/sock.c
index b026e1717df4..c501499a04fe 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -2619,7 +2619,7 @@ static void sock_def_error_report(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_poll(&wq->wait, POLLERR);
+                wake_up_interruptible_poll(&wq->wait, EPOLLERR);
        sk_wake_async(sk, SOCK_WAKE_IO, POLL_ERR);
        rcu_read_unlock();
 }
@@ -2631,8 +2631,8 @@ static void sock_def_readable(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLIN | POLLPRI |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN | EPOLLPRI |
-                                                POLLRDNORM | POLLRDBAND);
+                                                EPOLLRDNORM | EPOLLRDBAND);
        sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
        rcu_read_unlock();
 }
@@ -2649,8 +2649,8 @@ static void sock_def_write_space(struct sock *sk)
        if ((refcount_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf) {
                wq = rcu_dereference(sk->sk_wq);
                if (skwq_has_sleeper(wq))
-                        wake_up_interruptible_sync_poll(&wq->wait, POLLOUT |
+                        wake_up_interruptible_sync_poll(&wq->wait, EPOLLOUT |
-                                                POLLWRNORM | POLLWRBAND);
+                                                EPOLLWRNORM | EPOLLWRBAND);
                /* Should agree with poll, otherwise some programs break */
                if (sock_writeable(sk))
diff --git a/net/core/stream.c b/net/core/stream.c
index 1cff9c6270c6..7d329fb1f553 100644
--- a/net/core/stream.c
+++ b/net/core/stream.c
@@ -38,8 +38,8 @@ void sk_stream_write_space(struct sock *sk)
                rcu_read_lock();
                wq = rcu_dereference(sk->sk_wq);
                if (skwq_has_sleeper(wq))
-                        wake_up_interruptible_poll(&wq->wait, POLLOUT |
+                        wake_up_interruptible_poll(&wq->wait, EPOLLOUT |
-                                                POLLWRNORM | POLLWRBAND);
+                                                EPOLLWRNORM | EPOLLWRBAND);
                if (wq && wq->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))
                        sock_wake_async(wq, SOCK_WAKE_SPACE, POLL_OUT);
                rcu_read_unlock();
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 74685fecfdb9..15bdc002d90c 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -338,21 +338,21 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
        mask = 0;
        if (sk->sk_err)
-                mask = POLLERR;
+                mask = EPOLLERR;
        if (sk->sk_shutdown == SHUTDOWN_MASK || sk->sk_state == DCCP_CLOSED)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLIN | POLLRDNORM | POLLRDHUP;
+                mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
        /* Connected? */
        if ((1 << sk->sk_state) & ~(DCCPF_REQUESTING | DCCPF_RESPOND)) {
                if (atomic_read(&sk->sk_rmem_alloc) > 0)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
                        if (sk_stream_is_writeable(sk)) {
-                                mask |= POLLOUT | POLLWRNORM;
+                                mask |= EPOLLOUT | EPOLLWRNORM;
                        } else {  /* send SIGIO later */
                                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
                                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
@@ -362,7 +362,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
                                 * IO signal will be lost.
                                 */
                                if (sk_stream_is_writeable(sk))
-                                        mask |= POLLOUT | POLLWRNORM;
+                                        mask |= EPOLLOUT | EPOLLWRNORM;
                        }
                }
        }
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
index cc1b505453a8..91dd09f79808 100644
--- a/net/decnet/af_decnet.c
+++ b/net/decnet/af_decnet.c
@@ -1216,7 +1216,7 @@ static __poll_t dn_poll(struct file *file, struct socket *sock, poll_table  *wai
        __poll_t mask = datagram_poll(file, sock, wait);
        if (!skb_queue_empty(&scp->other_receive_queue))
-                mask |= POLLRDBAND;
+                mask |= EPOLLRDBAND;
        return mask;
 }
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
index c24008daa3d8..e4329e161943 100644
--- a/net/ipv4/af_inet.c
+++ b/net/ipv4/af_inet.c
@@ -828,7 +828,7 @@ int inet_shutdown(struct socket *sock, int how)
        case TCP_CLOSE:
                err = -ENOTCONN;
                /* Hack to wake up other listeners, who can poll for
-                   POLLHUP, even on eg. unconnected UDP sockets -- RR */
+                   EPOLLHUP, even on eg. unconnected UDP sockets -- RR */
                /* fall through */
        default:
                sk->sk_shutdown |= how;
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index c059aa7df0a9..48636aee23c3 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -512,36 +512,36 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
        mask = 0;
        /*
-         * POLLHUP is certainly not done right. But poll() doesn't
+         * EPOLLHUP is certainly not done right. But poll() doesn't
         * have a notion of HUP in just one direction, and for a
         * socket the read side is more interesting.
         *
-         * Some poll() documentation says that POLLHUP is incompatible
+         * Some poll() documentation says that EPOLLHUP is incompatible
-         * with the POLLOUT/POLLWR flags, so somebody should check this
+         * with the EPOLLOUT/POLLWR flags, so somebody should check this
         * all. But careful, it tends to be safer to return too many
         * bits than too few, and you can easily break real applications
         * if you don't tell them that something has hung up!
         *
         * Check-me.
         *
-         * Check number 1. POLLHUP is _UNMASKABLE_ event (see UNIX98 and
+         * Check number 1. EPOLLHUP is _UNMASKABLE_ event (see UNIX98 and
         * our fs/select.c). It means that after we received EOF,
         * poll always returns immediately, making impossible poll() on write()
-         * in state CLOSE_WAIT. One solution is evident --- to set POLLHUP
+         * in state CLOSE_WAIT. One solution is evident --- to set EPOLLHUP
         * if and only if shutdown has been made in both directions.
         * Actually, it is interesting to look how Solaris and DUX
-         * solve this dilemma. I would prefer, if POLLHUP were maskable,
+         * solve this dilemma. I would prefer, if EPOLLHUP were maskable,
         * then we could set it on SND_SHUTDOWN. BTW examples given
         * in Stevens' books assume exactly this behaviour, it explains
-         * why POLLHUP is incompatible with POLLOUT.    --ANK
+         * why EPOLLHUP is incompatible with EPOLLOUT.  --ANK
         *
         * NOTE. Check for TCP_CLOSE is added. The goal is to prevent
         * blocking on fresh not-connected or disconnected socket. --ANK
         */
        if (sk->sk_shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLIN | POLLRDNORM | POLLRDHUP;
+                mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
        /* Connected or passive Fast Open socket? */
        if (state != TCP_SYN_SENT &&
@@ -554,11 +554,11 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
                        target++;
                if (tp->rcv_nxt - tp->copied_seq >= target)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                if (!(sk->sk_shutdown & SEND_SHUTDOWN)) {
                        if (sk_stream_is_writeable(sk)) {
-                                mask |= POLLOUT | POLLWRNORM;
+                                mask |= EPOLLOUT | EPOLLWRNORM;
                        } else {  /* send SIGIO later */
                                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
                                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
@@ -570,24 +570,24 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
                                 */
                                smp_mb__after_atomic();
                                if (sk_stream_is_writeable(sk))
-                                        mask |= POLLOUT | POLLWRNORM;
+                                        mask |= EPOLLOUT | EPOLLWRNORM;
                        }
                } else
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
                if (tp->urg_data & TCP_URG_VALID)
-                        mask |= POLLPRI;
+                        mask |= EPOLLPRI;
        } else if (state == TCP_SYN_SENT && inet_sk(sk)->defer_connect) {
                /* Active TCP fastopen socket with defer_connect
-                 * Return POLLOUT so application can call write()
+                 * Return EPOLLOUT so application can call write()
                 * in order for kernel to generate SYN+data
                 */
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        }
        /* This barrier is coupled with smp_wmb() in tcp_reset() */
        smp_rmb();
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        return mask;
 }
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index cfa51cfd2d99..575d3c1fb6e8 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -315,7 +315,7 @@ static void tcp_sndbuf_expand(struct sock *sk)
        /* Fast Recovery (RFC 5681 3.2) :
         * Cubic needs 1.7 factor, rounded to 2 to include
-         * extra cushion (application might react slowly to POLLOUT)
+         * extra cushion (application might react slowly to EPOLLOUT)
         */
        sndmem = ca_ops->sndbuf_expand ? ca_ops->sndbuf_expand(sk) : 2;
        sndmem *= nr_segs * per_mss;
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index f81f969f9c06..bfaefe560b5c 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -2501,12 +2501,12 @@ __poll_t udp_poll(struct file *file, struct socket *sock, poll_table *wait)
        struct sock *sk = sock->sk;
        if (!skb_queue_empty(&udp_sk(sk)->reader_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* Check for false positives due to checksum errors */
-        if ((mask & POLLRDNORM) && !(file->f_flags & O_NONBLOCK) &&
+        if ((mask & EPOLLRDNORM) && !(file->f_flags & O_NONBLOCK) &&
            !(sk->sk_shutdown & RCV_SHUTDOWN) && first_packet_length(sk) == -1)
-                mask &= ~(POLLIN | POLLRDNORM);
+                mask &= ~(EPOLLIN | EPOLLRDNORM);
        return mask;
diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 64331158d693..1e8cc7bcbca3 100644
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1483,7 +1483,7 @@ static inline __poll_t iucv_accept_poll(struct sock *parent)
                sk = (struct sock *) isk;
                if (sk->sk_state == IUCV_CONNECTED)
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
        }
        return 0;
@@ -1501,27 +1501,27 @@ __poll_t iucv_sock_poll(struct file *file, struct socket *sock,
                return iucv_accept_poll(sk);
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
+                mask |= EPOLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP;
+                mask |= EPOLLRDHUP;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (!skb_queue_empty(&sk->sk_receive_queue) ||
            (sk->sk_shutdown & RCV_SHUTDOWN))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (sk->sk_state == IUCV_CLOSED)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_state == IUCV_DISCONN)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        if (sock_writeable(sk) && iucv_below_msglim(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        else
                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index 4a8d407f8902..f297d53a11aa 100644
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -396,8 +396,8 @@ static int kcm_read_sock_done(struct strparser *strp, int err)
 static void psock_state_change(struct sock *sk)
 {
-        /* TCP only does a POLLIN for a half close. Do a POLLHUP here
+        /* TCP only does a EPOLLIN for a half close. Do a EPOLLHUP here
-         * since application will normally not poll with POLLIN
+         * since application will normally not poll with EPOLLIN
         * on the TCP sockets.
         */
@@ -1338,7 +1338,7 @@ static void init_kcm_sock(struct kcm_sock *kcm, struct kcm_mux *mux)
        /* For SOCK_SEQPACKET sock type, datagram_poll checks the sk_state, so
         * we set sk_state, otherwise epoll_wait always returns right away with
-         * POLLHUP
+         * EPOLLHUP
         */
        kcm->sk.sk_state = TCP_ESTABLISHED;
diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index 985909f105eb..376040092142 100644
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -543,7 +543,7 @@ static inline __poll_t llcp_accept_poll(struct sock *parent)
                sk = &llcp_sock->sk;
                if (sk->sk_state == LLCP_CONNECTED)
-                        return POLLIN | POLLRDNORM;
+                        return EPOLLIN | EPOLLRDNORM;
        }
        return 0;
@@ -563,23 +563,23 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
                return llcp_accept_poll(sk);
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
+                mask |= EPOLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (sk->sk_state == LLCP_CLOSED)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sock_writeable(sk) && sk->sk_state == LLCP_CONNECTED)
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        else
                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 1d1483007e46..e0f3f4aeeb4f 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -4085,7 +4085,7 @@ static __poll_t packet_poll(struct file *file, struct socket *sock,
        if (po->rx_ring.pg_vec) {
                if (!packet_previous_rx_frame(po, &po->rx_ring,
                        TP_STATUS_KERNEL))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        if (po->pressure && __packet_rcv_has_room(po, NULL) == ROOM_NORMAL)
                po->pressure = 0;
@@ -4093,7 +4093,7 @@ static __poll_t packet_poll(struct file *file, struct socket *sock,
        spin_lock_bh(&sk->sk_write_queue.lock);
        if (po->tx_ring.pg_vec) {
                if (packet_current_frame(po, &po->tx_ring, TP_STATUS_AVAILABLE))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
        spin_unlock_bh(&sk->sk_write_queue.lock);
        return mask;
diff --git a/net/phonet/socket.c b/net/phonet/socket.c
index 08f6751d2030..fffcd69f63ff 100644
--- a/net/phonet/socket.c
+++ b/net/phonet/socket.c
@@ -351,18 +351,18 @@ static __poll_t pn_socket_poll(struct file *file, struct socket *sock,
        poll_wait(file, sk_sleep(sk), wait);
        if (sk->sk_state == TCP_CLOSE)
-                return POLLERR;
+                return EPOLLERR;
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (!skb_queue_empty(&pn->ctrlreq_queue))
-                mask |= POLLPRI;
+                mask |= EPOLLPRI;
        if (!mask && sk->sk_state == TCP_CLOSE_WAIT)
-                return POLLHUP;
+                return EPOLLHUP;
        if (sk->sk_state == TCP_ESTABLISHED &&
                refcount_read(&sk->sk_wmem_alloc) < sk->sk_sndbuf &&
                atomic_read(&pn->tx_credits))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        return mask;
 }
diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index 88aa8ad0f5b6..744c637c86b0 100644
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -137,17 +137,17 @@ static int rds_getname(struct socket *sock, struct sockaddr *uaddr,
 /*
 * RDS' poll is without a doubt the least intuitive part of the interface,
- * as POLLIN and POLLOUT do not behave entirely as you would expect from
+ * as EPOLLIN and EPOLLOUT do not behave entirely as you would expect from
 * a network protocol.
 *
- * POLLIN is asserted if
+ * EPOLLIN is asserted if
 *  -   there is data on the receive queue.
 *  -   to signal that a previously congested destination may have become
 *      uncongested
 *  -   A notification has been queued to the socket (this can be a congestion
 *      update, or a RDMA completion).
 *
- * POLLOUT is asserted if there is room on the send queue. This does not mean
+ * EPOLLOUT is asserted if there is room on the send queue. This does not mean
 * however, that the next sendmsg() call will succeed. If the application tries
 * to send to a congested destination, the system call may still fail (and
 * return ENOBUFS).
@@ -167,22 +167,22 @@ static __poll_t rds_poll(struct file *file, struct socket *sock,
        read_lock_irqsave(&rs->rs_recv_lock, flags);
        if (!rs->rs_cong_monitor) {
-                /* When a congestion map was updated, we signal POLLIN for
+                /* When a congestion map was updated, we signal EPOLLIN for
                 * "historical" reasons. Applications can also poll for
                 * WRBAND instead. */
                if (rds_cong_updated_since(&rs->rs_cong_track))
-                        mask |= (POLLIN | POLLRDNORM | POLLWRBAND);
+                        mask |= (EPOLLIN | EPOLLRDNORM | EPOLLWRBAND);
        } else {
                spin_lock(&rs->rs_lock);
                if (rs->rs_cong_notify)
-                        mask |= (POLLIN | POLLRDNORM);
+                        mask |= (EPOLLIN | EPOLLRDNORM);
                spin_unlock(&rs->rs_lock);
        }
        if (!list_empty(&rs->rs_recv_queue) ||
            !list_empty(&rs->rs_notify_queue))
-                mask |= (POLLIN | POLLRDNORM);
+                mask |= (EPOLLIN | EPOLLRDNORM);
        if (rs->rs_snd_bytes < rds_sk_sndbuf(rs))
-                mask |= (POLLOUT | POLLWRNORM);
+                mask |= (EPOLLOUT | EPOLLWRNORM);
        read_unlock_irqrestore(&rs->rs_recv_lock, flags);
        /* clear state any time we wake a seen-congested socket */
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 124c77e9d058..59d0eb960275 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -1142,13 +1142,13 @@ static int rfkill_fop_open(struct inode *inode, struct file *file)
 static __poll_t rfkill_fop_poll(struct file *file, poll_table *wait)
 {
        struct rfkill_data *data = file->private_data;
-        __poll_t res = POLLOUT | POLLWRNORM;
+        __poll_t res = EPOLLOUT | EPOLLWRNORM;
        poll_wait(file, &data->read_wait, wait);
        mutex_lock(&data->mtx);
        if (!list_empty(&data->events))
-                res = POLLIN | POLLRDNORM;
+                res = EPOLLIN | EPOLLRDNORM;
        mutex_unlock(&data->mtx);
        return res;
diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 21ad6a3a465c..0c9c18aa7c77 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -742,13 +742,13 @@ static __poll_t rxrpc_poll(struct file *file, struct socket *sock,
        /* the socket is readable if there are any messages waiting on the Rx
         * queue */
        if (!list_empty(&rx->recvmsg_q))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* the socket is writable if there is space to add new data to the
         * socket; there is no guarantee that any particular call in progress
         * on the socket may have space in the Tx ACK window */
        if (rxrpc_writable(sk))
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index ebb8cb9eb0bd..bf271f8c2dc9 100644
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -7602,22 +7602,22 @@ __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
         */
        if (sctp_style(sk, TCP) && sctp_sstate(sk, LISTENING))
                return (!list_empty(&sp->ep->asocs)) ?
-                        (POLLIN | POLLRDNORM) : 0;
+                        (EPOLLIN | EPOLLRDNORM) : 0;
        mask = 0;
        /* Is there any exceptional events?  */
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
+                mask |= EPOLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        /* Is it readable?  Reconsider this code with TCP-style support.  */
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* The association is either gone or not ready.  */
        if (!sctp_style(sk, UDP) && sctp_sstate(sk, CLOSED))
@@ -7625,7 +7625,7 @@ __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
        /* Is it writable?  */
        if (sctp_writeable(sk)) {
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        } else {
                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
                /*
@@ -7637,7 +7637,7 @@ __poll_t sctp_poll(struct file *file, struct socket *sock, poll_table *wait)
                 * in the following code to cover it as well.
                 */
                if (sctp_writeable(sk))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
        return mask;
 }
@@ -8161,8 +8161,8 @@ void sctp_data_ready(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLIN |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN |
-                                                POLLRDNORM | POLLRDBAND);
+                                                EPOLLRDNORM | EPOLLRDBAND);
        sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
        rcu_read_unlock();
 }
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index ba4b84debc5a..da1a5cdefd13 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1145,7 +1145,7 @@ static __poll_t smc_accept_poll(struct sock *parent)
        spin_lock(&isk->accept_q_lock);
        if (!list_empty(&isk->accept_q))
-                mask = POLLIN | POLLRDNORM;
+                mask = EPOLLIN | EPOLLRDNORM;
        spin_unlock(&isk->accept_q_lock);
        return mask;
@@ -1160,7 +1160,7 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
        int rc;
        if (!sk)
-                return POLLNVAL;
+                return EPOLLNVAL;
        smc = smc_sk(sock->sk);
        sock_hold(sk);
@@ -1171,16 +1171,16 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
                mask = smc->clcsock->ops->poll(file, smc->clcsock, wait);
                /* if non-blocking connect finished ... */
                lock_sock(sk);
-                if ((sk->sk_state == SMC_INIT) && (mask & POLLOUT)) {
+                if ((sk->sk_state == SMC_INIT) && (mask & EPOLLOUT)) {
                        sk->sk_err = smc->clcsock->sk->sk_err;
                        if (sk->sk_err) {
-                                mask |= POLLERR;
+                                mask |= EPOLLERR;
                        } else {
                                rc = smc_connect_rdma(smc);
                                if (rc < 0)
-                                        mask |= POLLERR;
+                                        mask |= EPOLLERR;
                                /* success cases including fallback */
-                                mask |= POLLOUT | POLLWRNORM;
+                                mask |= EPOLLOUT | EPOLLWRNORM;
                        }
                }
        } else {
@@ -1190,27 +1190,27 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
                        lock_sock(sk);
                }
                if (sk->sk_err)
-                        mask |= POLLERR;
+                        mask |= EPOLLERR;
                if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
                    (sk->sk_state == SMC_CLOSED))
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                if (sk->sk_state == SMC_LISTEN) {
                        /* woken up by sk_data_ready in smc_listen_work() */
                        mask = smc_accept_poll(sk);
                } else {
                        if (atomic_read(&smc->conn.sndbuf_space) ||
                            sk->sk_shutdown & SEND_SHUTDOWN) {
-                                mask |= POLLOUT | POLLWRNORM;
+                                mask |= EPOLLOUT | EPOLLWRNORM;
                        } else {
                                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
                                set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
                        }
                        if (atomic_read(&smc->conn.bytes_to_rcv))
-                                mask |= POLLIN | POLLRDNORM;
+                                mask |= EPOLLIN | EPOLLRDNORM;
                        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                                mask |= POLLIN | POLLRDNORM | POLLRDHUP;
+                                mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
                        if (sk->sk_state == SMC_APPCLOSEWAIT1)
-                                mask |= POLLIN;
+                                mask |= EPOLLIN;
                }
        }
diff --git a/net/smc/smc_rx.c b/net/smc/smc_rx.c
index 9dc392ca06bf..eff4e0d0bb31 100644
--- a/net/smc/smc_rx.c
+++ b/net/smc/smc_rx.c
@@ -35,8 +35,8 @@ static void smc_rx_data_ready(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLIN | POLLPRI |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN | EPOLLPRI |
-                                                POLLRDNORM | POLLRDBAND);
+                                                EPOLLRDNORM | EPOLLRDBAND);
        sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
        if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
            (sk->sk_state == SMC_CLOSED))
diff --git a/net/smc/smc_tx.c b/net/smc/smc_tx.c
index 838bce20c361..72f004c9c9b1 100644
--- a/net/smc/smc_tx.c
+++ b/net/smc/smc_tx.c
@@ -46,8 +46,8 @@ static void smc_tx_write_space(struct sock *sk)
                wq = rcu_dereference(sk->sk_wq);
                if (skwq_has_sleeper(wq))
                        wake_up_interruptible_poll(&wq->wait,
-                                                   POLLOUT | POLLWRNORM |
+                                                   EPOLLOUT | EPOLLWRNORM |
-                                                   POLLWRBAND);
+                                                   EPOLLWRBAND);
                if (wq && wq->fasync_list && !(sk->sk_shutdown & SEND_SHUTDOWN))
                        sock_wake_async(wq, SOCK_WAKE_SPACE, POLL_OUT);
                rcu_read_unlock();
diff --git a/net/sunrpc/cache.c b/net/sunrpc/cache.c
index aa36dad32db1..8a7e1c774f9c 100644
--- a/net/sunrpc/cache.c
+++ b/net/sunrpc/cache.c
@@ -940,7 +940,7 @@ static __poll_t cache_poll(struct file *filp, poll_table *wait,
        poll_wait(filp, &queue_wait, wait);
        /* alway allow write */
-        mask = POLLOUT | POLLWRNORM;
+        mask = EPOLLOUT | EPOLLWRNORM;
        if (!rp)
                return mask;
@@ -950,7 +950,7 @@ static __poll_t cache_poll(struct file *filp, poll_table *wait,
        for (cq= &rp->q; &cq->list != &cd->queue;
             cq = list_entry(cq->list.next, struct cache_queue, list))
                if (!cq->reader) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                        break;
                }
        spin_unlock(&queue_lock);
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
index 5c4330325787..fc97fc3ed637 100644
--- a/net/sunrpc/rpc_pipe.c
+++ b/net/sunrpc/rpc_pipe.c
@@ -345,15 +345,15 @@ rpc_pipe_poll(struct file *filp, struct poll_table_struct *wait)
 {
        struct inode *inode = file_inode(filp);
        struct rpc_inode *rpci = RPC_I(inode);
-        __poll_t mask = POLLOUT | POLLWRNORM;
+        __poll_t mask = EPOLLOUT | EPOLLWRNORM;
        poll_wait(filp, &rpci->waitq, wait);
        inode_lock(inode);
        if (rpci->pipe == NULL)
-                mask |= POLLERR | POLLHUP;
+                mask |= EPOLLERR | EPOLLHUP;
        else if (filp->private_data || !list_empty(&rpci->pipe->pipe))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        inode_unlock(inode);
        return mask;
 }
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 163f3a547501..b0323ec7971e 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -721,31 +721,31 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
        sock_poll_wait(file, sk_sleep(sk), wait);
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                revents |= POLLRDHUP | POLLIN | POLLRDNORM;
+                revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                revents |= POLLHUP;
+                revents |= EPOLLHUP;
        switch (sk->sk_state) {
        case TIPC_ESTABLISHED:
        case TIPC_CONNECTING:
                if (!tsk->cong_link_cnt && !tsk_conn_cong(tsk))
-                        revents |= POLLOUT;
+                        revents |= EPOLLOUT;
                /* fall thru' */
        case TIPC_LISTEN:
                if (!skb_queue_empty(&sk->sk_receive_queue))
-                        revents |= POLLIN | POLLRDNORM;
+                        revents |= EPOLLIN | EPOLLRDNORM;
                break;
        case TIPC_OPEN:
                if (tsk->group_is_open && !tsk->cong_link_cnt)
-                        revents |= POLLOUT;
+                        revents |= EPOLLOUT;
                if (!tipc_sk_type_connectionless(sk))
                        break;
                if (skb_queue_empty(&sk->sk_receive_queue))
                        break;
-                revents |= POLLIN | POLLRDNORM;
+                revents |= EPOLLIN | EPOLLRDNORM;
                break;
        case TIPC_DISCONNECTING:
-                revents = POLLIN | POLLRDNORM | POLLHUP;
+                revents = EPOLLIN | EPOLLRDNORM | EPOLLHUP;
                break;
        }
        return revents;
@@ -1897,8 +1897,8 @@ static void tipc_write_space(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLOUT |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLOUT |
-                                                POLLWRNORM | POLLWRBAND);
+                                                EPOLLWRNORM | EPOLLWRBAND);
        rcu_read_unlock();
 }
@@ -1914,8 +1914,8 @@ static void tipc_data_ready(struct sock *sk)
        rcu_read_lock();
        wq = rcu_dereference(sk->sk_wq);
        if (skwq_has_sleeper(wq))
-                wake_up_interruptible_sync_poll(&wq->wait, POLLIN |
+                wake_up_interruptible_sync_poll(&wq->wait, EPOLLIN |
-                                                POLLRDNORM | POLLRDBAND);
+                                                EPOLLRDNORM | EPOLLRDBAND);
        rcu_read_unlock();
 }
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 0214acbd6bff..d545e1d0dea2 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -415,9 +415,9 @@ static void unix_dgram_peer_wake_disconnect_wakeup(struct sock *sk,
 {
        unix_dgram_peer_wake_disconnect(sk, other);
        wake_up_interruptible_poll(sk_sleep(sk),
-                                   POLLOUT |
+                                   EPOLLOUT |
-                                   POLLWRNORM |
+                                   EPOLLWRNORM |
-                                   POLLWRBAND);
+                                   EPOLLWRBAND);
 }
 /* preconditions:
@@ -454,7 +454,7 @@ static void unix_write_space(struct sock *sk)
                wq = rcu_dereference(sk->sk_wq);
                if (skwq_has_sleeper(wq))
                        wake_up_interruptible_sync_poll(&wq->wait,
-                                POLLOUT | POLLWRNORM | POLLWRBAND);
+                                EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND);
                sk_wake_async(sk, SOCK_WAKE_SPACE, POLL_OUT);
        }
        rcu_read_unlock();
@@ -2129,8 +2129,8 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
        if (wq_has_sleeper(&u->peer_wait))
                wake_up_interruptible_sync_poll(&u->peer_wait,
-                                                POLLOUT | POLLWRNORM |
+                                                EPOLLOUT | EPOLLWRNORM |
-                                                POLLWRBAND);
+                                                EPOLLWRBAND);
        if (msg->msg_name)
                unix_copy_addr(msg, skb->sk);
@@ -2650,27 +2650,27 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
        /* exceptional events? */
        if (sk->sk_err)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* Connection-based need to check for termination and startup */
        if ((sk->sk_type == SOCK_STREAM || sk->sk_type == SOCK_SEQPACKET) &&
            sk->sk_state == TCP_CLOSE)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        /*
         * we set writable also when the other side has shut down the
         * connection. This prevents stuck sockets.
         */
        if (unix_writable(sk))
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        return mask;
 }
@@ -2687,29 +2687,29 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
        /* exceptional events? */
        if (sk->sk_err || !skb_queue_empty(&sk->sk_error_queue))
-                mask |= POLLERR |
+                mask |= EPOLLERR |
-                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? POLLPRI : 0);
+                        (sock_flag(sk, SOCK_SELECT_ERR_QUEUE) ? EPOLLPRI : 0);
        if (sk->sk_shutdown & RCV_SHUTDOWN)
-                mask |= POLLRDHUP | POLLIN | POLLRDNORM;
+                mask |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;
        if (sk->sk_shutdown == SHUTDOWN_MASK)
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        /* readable? */
        if (!skb_queue_empty(&sk->sk_receive_queue))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        /* Connection-based need to check for termination and startup */
        if (sk->sk_type == SOCK_SEQPACKET) {
                if (sk->sk_state == TCP_CLOSE)
-                        mask |= POLLHUP;
+                        mask |= EPOLLHUP;
                /* connection hasn't started yet? */
                if (sk->sk_state == TCP_SYN_SENT)
                        return mask;
        }
        /* No write status requested, avoid expensive OUT tests. */
-        if (!(poll_requested_events(wait) & (POLLWRBAND|POLLWRNORM|POLLOUT)))
+        if (!(poll_requested_events(wait) & (EPOLLWRBAND|EPOLLWRNORM|EPOLLOUT)))
                return mask;
        writable = unix_writable(sk);
@@ -2726,7 +2726,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
        }
        if (writable)
-                mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        else
                sk_set_bit(SOCKWQ_ASYNC_NOSPACE, sk);
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 9d95e773f4c8..e0fc84daed94 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -865,20 +865,20 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
        if (sk->sk_err)
                /* Signify that there has been an error on this socket. */
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        /* INET sockets treat local write shutdown and peer write shutdown as a
-         * case of POLLHUP set.
+         * case of EPOLLHUP set.
         */
        if ((sk->sk_shutdown == SHUTDOWN_MASK) ||
            ((sk->sk_shutdown & SEND_SHUTDOWN) &&
             (vsk->peer_shutdown & SEND_SHUTDOWN))) {
-                mask |= POLLHUP;
+                mask |= EPOLLHUP;
        }
        if (sk->sk_shutdown & RCV_SHUTDOWN ||
            vsk->peer_shutdown & SEND_SHUTDOWN) {
-                mask |= POLLRDHUP;
+                mask |= EPOLLRDHUP;
        }
        if (sock->type == SOCK_DGRAM) {
@@ -888,11 +888,11 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                 */
                if (!skb_queue_empty(&sk->sk_receive_queue) ||
                    (sk->sk_shutdown & RCV_SHUTDOWN)) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                }
                if (!(sk->sk_shutdown & SEND_SHUTDOWN))
-                        mask |= POLLOUT | POLLWRNORM | POLLWRBAND;
+                        mask |= EPOLLOUT | EPOLLWRNORM | EPOLLWRBAND;
        } else if (sock->type == SOCK_STREAM) {
                lock_sock(sk);
@@ -902,7 +902,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                 */
                if (sk->sk_state == TCP_LISTEN
                    && !vsock_is_accept_queue_empty(sk))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                /* If there is something in the queue then we can read. */
                if (transport->stream_is_active(vsk) &&
@@ -911,10 +911,10 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                        int ret = transport->notify_poll_in(
                                        vsk, 1, &data_ready_now);
                        if (ret < 0) {
-                                mask |= POLLERR;
+                                mask |= EPOLLERR;
                        } else {
                                if (data_ready_now)
-                                        mask |= POLLIN | POLLRDNORM;
+                                        mask |= EPOLLIN | EPOLLRDNORM;
                        }
                }
@@ -925,7 +925,7 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                 */
                if (sk->sk_shutdown & RCV_SHUTDOWN ||
                    vsk->peer_shutdown & SEND_SHUTDOWN) {
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                }
                /* Connected sockets that can produce data can be written. */
@@ -935,25 +935,25 @@ static __poll_t vsock_poll(struct file *file, struct socket *sock,
                                int ret = transport->notify_poll_out(
                                                vsk, 1, &space_avail_now);
                                if (ret < 0) {
-                                        mask |= POLLERR;
+                                        mask |= EPOLLERR;
                                } else {
                                        if (space_avail_now)
-                                                /* Remove POLLWRBAND since INET
+                                                /* Remove EPOLLWRBAND since INET
                                                 * sockets are not setting it.
                                                 */
-                                                mask |= POLLOUT | POLLWRNORM;
+                                                mask |= EPOLLOUT | EPOLLWRNORM;
                                }
                        }
                }
                /* Simulate INET socket poll behaviors, which sets
-                 * POLLOUT|POLLWRNORM when peer is closed and nothing to read,
+                 * EPOLLOUT|EPOLLWRNORM when peer is closed and nothing to read,
                 * but local send is not shutdown.
                 */
                if (sk->sk_state == TCP_CLOSE || sk->sk_state == TCP_CLOSING) {
                        if (!(sk->sk_shutdown & SEND_SHUTDOWN))
-                                mask |= POLLOUT | POLLWRNORM;
+                                mask |= EPOLLOUT | EPOLLWRNORM;
                }
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
index 4d202b73a0e1..a9428daa69f3 100644
--- a/security/apparmor/apparmorfs.c
+++ b/security/apparmor/apparmorfs.c
@@ -580,7 +580,7 @@ static __poll_t ns_revision_poll(struct file *file, poll_table *pt)
                mutex_lock_nested(&rev->ns->lock, rev->ns->level);
                poll_wait(file, &rev->ns->wait, pt);
                if (rev->last_read < rev->ns->revision)
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                mutex_unlock(&rev->ns->lock);
        }
diff --git a/security/tomoyo/audit.c b/security/tomoyo/audit.c
index 558e3076d38c..479b03a7a17e 100644
--- a/security/tomoyo/audit.c
+++ b/security/tomoyo/audit.c
@@ -456,14 +456,14 @@ void tomoyo_read_log(struct tomoyo_io_buffer *head)
 * @file: Pointer to "struct file".
 * @wait: Pointer to "poll_table". Maybe NULL.
 *
- * Returns POLLIN | POLLRDNORM when ready to read an audit log.
+ * Returns EPOLLIN | EPOLLRDNORM when ready to read an audit log.
 */
 __poll_t tomoyo_poll_log(struct file *file, poll_table *wait)
 {
        if (tomoyo_log_count)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        poll_wait(file, &tomoyo_log_wait, wait);
        if (tomoyo_log_count)
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 70c73bf66c88..03923a138ef5 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -2116,17 +2116,17 @@ static struct tomoyo_domain_info *tomoyo_find_domain_by_qid
 * @file: Pointer to "struct file".
 * @wait: Pointer to "poll_table".
 *
- * Returns POLLIN | POLLRDNORM when ready to read, 0 otherwise.
+ * Returns EPOLLIN | EPOLLRDNORM when ready to read, 0 otherwise.
 *
 * Waits for access requests which violated policy in enforcing mode.
 */
 static __poll_t tomoyo_poll_query(struct file *file, poll_table *wait)
 {
        if (!list_empty(&tomoyo_query_list))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        poll_wait(file, &tomoyo_query_wait, wait);
        if (!list_empty(&tomoyo_query_list))
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
        return 0;
 }
@@ -2450,15 +2450,15 @@ int tomoyo_open_control(const u8 type, struct file *file)
 * @file: Pointer to "struct file".
 * @wait: Pointer to "poll_table". Maybe NULL.
 *
- * Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,
+ * Returns EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM if ready to read/write,
- * POLLOUT | POLLWRNORM otherwise.
+ * EPOLLOUT | EPOLLWRNORM otherwise.
 */
 __poll_t tomoyo_poll_control(struct file *file, poll_table *wait)
 {
        struct tomoyo_io_buffer *head = file->private_data;
        if (head->poll)
-                return head->poll(file, wait) | POLLOUT | POLLWRNORM;
+                return head->poll(file, wait) | EPOLLOUT | EPOLLWRNORM;
-        return POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM;
+        return EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM;
 }
 /**
diff --git a/security/tomoyo/securityfs_if.c b/security/tomoyo/securityfs_if.c
index fb9bf99deb35..1d3d7e7a1f05 100644
--- a/security/tomoyo/securityfs_if.c
+++ b/security/tomoyo/securityfs_if.c
@@ -154,8 +154,8 @@ static int tomoyo_release(struct inode *inode, struct file *file)
 * @file: Pointer to "struct file".
 * @wait: Pointer to "poll_table". Maybe NULL.
 *
- * Returns POLLIN | POLLRDNORM | POLLOUT | POLLWRNORM if ready to read/write,
+ * Returns EPOLLIN | EPOLLRDNORM | EPOLLOUT | EPOLLWRNORM if ready to read/write,
- * POLLOUT | POLLWRNORM otherwise.
+ * EPOLLOUT | EPOLLWRNORM otherwise.
 */
 static __poll_t tomoyo_poll(struct file *file, poll_table *wait)
 {
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index a12b9555e910..4563432badba 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -399,9 +399,9 @@ static int snd_compr_mmap(struct file *f, struct vm_area_struct *vma)
 static __poll_t snd_compr_get_poll(struct snd_compr_stream *stream)
 {
        if (stream->direction == SND_COMPRESS_PLAYBACK)
-                return POLLOUT | POLLWRNORM;
+                return EPOLLOUT | EPOLLWRNORM;
        else
-                return POLLIN | POLLRDNORM;
+                return EPOLLIN | EPOLLRDNORM;
 }
 static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
@@ -412,7 +412,7 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
        __poll_t retval = 0;
        if (snd_BUG_ON(!data))
-                return POLLERR;
+                return EPOLLERR;
        stream = &data->stream;
@@ -421,7 +421,7 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
        switch (stream->runtime->state) {
        case SNDRV_PCM_STATE_OPEN:
        case SNDRV_PCM_STATE_XRUN:
-                retval = snd_compr_get_poll(stream) | POLLERR;
+                retval = snd_compr_get_poll(stream) | EPOLLERR;
                goto out;
        default:
                break;
@@ -447,7 +447,7 @@ static __poll_t snd_compr_poll(struct file *f, poll_table *wait)
                        retval = snd_compr_get_poll(stream);
                break;
        default:
-                retval = snd_compr_get_poll(stream) | POLLERR;
+                retval = snd_compr_get_poll(stream) | EPOLLERR;
                break;
        }
 out:
diff --git a/sound/core/control.c b/sound/core/control.c
index 50fa16022f1f..0b3026d937b1 100644
--- a/sound/core/control.c
+++ b/sound/core/control.c
@@ -1679,7 +1679,7 @@ static __poll_t snd_ctl_poll(struct file *file, poll_table * wait)
        mask = 0;
        if (!list_empty(&ctl->events))
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        return mask;
 }
diff --git a/sound/core/info.c b/sound/core/info.c
index aa86f3f8e056..4b36767af9e1 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -214,9 +214,9 @@ static __poll_t snd_info_entry_poll(struct file *file, poll_table *wait)
                                          data->file_private_data,
                                          file, wait);
        if (entry->c.ops->read)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (entry->c.ops->write)
-                mask |= POLLOUT | POLLWRNORM;
+                mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/sound/core/init.c b/sound/core/init.c
index 8753440c3a6e..4fa5dd955740 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -346,7 +346,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file)
 static __poll_t snd_disconnect_poll(struct file * file, poll_table * wait)
 {
-        return POLLERR | POLLNVAL;
+        return EPOLLERR | EPOLLNVAL;
 }
 static long snd_disconnect_ioctl(struct file *file,
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c
index 3ebba9c7f86e..b044c0a5a674 100644
--- a/sound/core/oss/pcm_oss.c
+++ b/sound/core/oss/pcm_oss.c
@@ -2705,7 +2705,7 @@ static __poll_t snd_pcm_oss_poll(struct file *file, poll_table * wait)
                if (runtime->status->state != SNDRV_PCM_STATE_DRAINING &&
                    (runtime->status->state != SNDRV_PCM_STATE_RUNNING ||
                     snd_pcm_oss_playback_ready(psubstream)))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
                snd_pcm_stream_unlock_irq(psubstream);
        }
        if (csubstream != NULL) {
@@ -2715,7 +2715,7 @@ static __poll_t snd_pcm_oss_poll(struct file *file, poll_table * wait)
                snd_pcm_stream_lock_irq(csubstream);
                if ((ostate = runtime->status->state) != SNDRV_PCM_STATE_RUNNING ||
                    snd_pcm_oss_capture_ready(csubstream))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
                snd_pcm_stream_unlock_irq(csubstream);
                if (ostate != SNDRV_PCM_STATE_RUNNING && runtime->oss.trigger) {
                        struct snd_pcm_oss_file ofile;
diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
index 51104df924e1..77ba50ddcf9e 100644
--- a/sound/core/pcm_native.c
+++ b/sound/core/pcm_native.c
@@ -3147,7 +3147,7 @@ static __poll_t snd_pcm_playback_poll(struct file *file, poll_table * wait)
        substream = pcm_file->substream;
        if (PCM_RUNTIME_CHECK(substream))
-                return POLLOUT | POLLWRNORM | POLLERR;
+                return EPOLLOUT | EPOLLWRNORM | EPOLLERR;
        runtime = substream->runtime;
        poll_wait(file, &runtime->sleep, wait);
@@ -3159,7 +3159,7 @@ static __poll_t snd_pcm_playback_poll(struct file *file, poll_table * wait)
        case SNDRV_PCM_STATE_PREPARED:
        case SNDRV_PCM_STATE_PAUSED:
                if (avail >= runtime->control->avail_min) {
-                        mask = POLLOUT | POLLWRNORM;
+                        mask = EPOLLOUT | EPOLLWRNORM;
                        break;
                }
                /* Fall through */
@@ -3167,7 +3167,7 @@ static __poll_t snd_pcm_playback_poll(struct file *file, poll_table * wait)
                mask = 0;
                break;
        default:
-                mask = POLLOUT | POLLWRNORM | POLLERR;
+                mask = EPOLLOUT | EPOLLWRNORM | EPOLLERR;
                break;
        }
        snd_pcm_stream_unlock_irq(substream);
@@ -3186,7 +3186,7 @@ static __poll_t snd_pcm_capture_poll(struct file *file, poll_table * wait)
        substream = pcm_file->substream;
        if (PCM_RUNTIME_CHECK(substream))
-                return POLLIN | POLLRDNORM | POLLERR;
+                return EPOLLIN | EPOLLRDNORM | EPOLLERR;
        runtime = substream->runtime;
        poll_wait(file, &runtime->sleep, wait);
@@ -3198,19 +3198,19 @@ static __poll_t snd_pcm_capture_poll(struct file *file, poll_table * wait)
        case SNDRV_PCM_STATE_PREPARED:
        case SNDRV_PCM_STATE_PAUSED:
                if (avail >= runtime->control->avail_min) {
-                        mask = POLLIN | POLLRDNORM;
+                        mask = EPOLLIN | EPOLLRDNORM;
                        break;
                }
                mask = 0;
                break;
        case SNDRV_PCM_STATE_DRAINING:
                if (avail > 0) {
-                        mask = POLLIN | POLLRDNORM;
+                        mask = EPOLLIN | EPOLLRDNORM;
                        break;
                }
                /* Fall through */
        default:
-                mask = POLLIN | POLLRDNORM | POLLERR;
+                mask = EPOLLIN | EPOLLRDNORM | EPOLLERR;
                break;
        }
        snd_pcm_stream_unlock_irq(substream);
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index fae21311723f..69616d00481c 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -1385,11 +1385,11 @@ static __poll_t snd_rawmidi_poll(struct file *file, poll_table * wait)
        mask = 0;
        if (rfile->input != NULL) {
                if (snd_rawmidi_ready(rfile->input))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        if (rfile->output != NULL) {
                if (snd_rawmidi_ready(rfile->output))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
        return mask;
 }
diff --git a/sound/core/seq/oss/seq_oss_rw.c b/sound/core/seq/oss/seq_oss_rw.c
index c538e78ca310..30886f5fb100 100644
--- a/sound/core/seq/oss/seq_oss_rw.c
+++ b/sound/core/seq/oss/seq_oss_rw.c
@@ -204,13 +204,13 @@ snd_seq_oss_poll(struct seq_oss_devinfo *dp, struct file *file, poll_table * wai
        /* input */
        if (dp->readq && is_read_mode(dp->file_mode)) {
                if (snd_seq_oss_readq_poll(dp->readq, file, wait))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        /* output */
        if (dp->writeq && is_write_mode(dp->file_mode)) {
                if (snd_seq_kernel_client_write_poll(dp->cseq, file, wait))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
        return mask;
 }
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c
index b611deef81f5..60db32785f62 100644
--- a/sound/core/seq/seq_clientmgr.c
+++ b/sound/core/seq/seq_clientmgr.c
@@ -1101,7 +1101,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait)
                /* check if data is available in the outqueue */
                if (snd_seq_fifo_poll_wait(client->data.user.fifo, file, wait))
-                        mask |= POLLIN | POLLRDNORM;
+                        mask |= EPOLLIN | EPOLLRDNORM;
        }
        if (snd_seq_file_flags(file) & SNDRV_SEQ_LFLG_OUTPUT) {
@@ -1109,7 +1109,7 @@ static __poll_t snd_seq_poll(struct file *file, poll_table * wait)
                /* check if data is available in the pool */
                if (!snd_seq_write_pool_allocated(client) ||
                    snd_seq_pool_poll_wait(client->pool, file, wait))
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        }
        return mask;
diff --git a/sound/core/timer.c b/sound/core/timer.c
index da05e314917f..dc87728c5b74 100644
--- a/sound/core/timer.c
+++ b/sound/core/timer.c
@@ -2084,9 +2084,9 @@ static __poll_t snd_timer_user_poll(struct file *file, poll_table * wait)
        mask = 0;
        spin_lock_irq(&tu->qlock);
        if (tu->qused)
-                mask |= POLLIN | POLLRDNORM;
+                mask |= EPOLLIN | EPOLLRDNORM;
        if (tu->disconnected)
-                mask |= POLLERR;
+                mask |= EPOLLERR;
        spin_unlock_irq(&tu->qlock);
        return mask;
diff --git a/sound/firewire/bebob/bebob_hwdep.c b/sound/firewire/bebob/bebob_hwdep.c
index 83e791810c52..04c321e08c62 100644
--- a/sound/firewire/bebob/bebob_hwdep.c
+++ b/sound/firewire/bebob/bebob_hwdep.c
@@ -63,7 +63,7 @@ hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait)
        spin_lock_irq(&bebob->lock);
        if (bebob->dev_lock_changed)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&bebob->lock);
diff --git a/sound/firewire/dice/dice-hwdep.c b/sound/firewire/dice/dice-hwdep.c
index 7a8af0f91c96..6498bf6909ba 100644
--- a/sound/firewire/dice/dice-hwdep.c
+++ b/sound/firewire/dice/dice-hwdep.c
@@ -62,7 +62,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
        spin_lock_irq(&dice->lock);
        if (dice->dev_lock_changed || dice->notification_bits != 0)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&dice->lock);
diff --git a/sound/firewire/digi00x/digi00x-hwdep.c b/sound/firewire/digi00x/digi00x-hwdep.c
index a084c2a834db..426cd39e0233 100644
--- a/sound/firewire/digi00x/digi00x-hwdep.c
+++ b/sound/firewire/digi00x/digi00x-hwdep.c
@@ -70,7 +70,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
        spin_lock_irq(&dg00x->lock);
        if (dg00x->dev_lock_changed || dg00x->msg)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&dg00x->lock);
diff --git a/sound/firewire/fireface/ff-hwdep.c b/sound/firewire/fireface/ff-hwdep.c
index 68e273fa5d23..336c0076ec42 100644
--- a/sound/firewire/fireface/ff-hwdep.c
+++ b/sound/firewire/fireface/ff-hwdep.c
@@ -62,7 +62,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
        spin_lock_irq(&ff->lock);
        if (ff->dev_lock_changed)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&ff->lock);
diff --git a/sound/firewire/fireworks/fireworks_hwdep.c b/sound/firewire/fireworks/fireworks_hwdep.c
index e0eff9328ee1..5cac26ab20b7 100644
--- a/sound/firewire/fireworks/fireworks_hwdep.c
+++ b/sound/firewire/fireworks/fireworks_hwdep.c
@@ -194,12 +194,12 @@ hwdep_poll(struct snd_hwdep *hwdep, struct file *file, poll_table *wait)
        spin_lock_irq(&efw->lock);
        if (efw->dev_lock_changed || efw->pull_ptr != efw->push_ptr)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&efw->lock);
-        return events | POLLOUT;
+        return events | EPOLLOUT;
 }
 static int
diff --git a/sound/firewire/motu/motu-hwdep.c b/sound/firewire/motu/motu-hwdep.c
index 7b6a086866e7..5f772eab588b 100644
--- a/sound/firewire/motu/motu-hwdep.c
+++ b/sound/firewire/motu/motu-hwdep.c
@@ -69,12 +69,12 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
        spin_lock_irq(&motu->lock);
        if (motu->dev_lock_changed || motu->msg)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&motu->lock);
-        return events | POLLOUT;
+        return events | EPOLLOUT;
 }
 static int hwdep_get_info(struct snd_motu *motu, void __user *arg)
diff --git a/sound/firewire/oxfw/oxfw-hwdep.c b/sound/firewire/oxfw/oxfw-hwdep.c
index 6c1828aff672..50a1c03b42b9 100644
--- a/sound/firewire/oxfw/oxfw-hwdep.c
+++ b/sound/firewire/oxfw/oxfw-hwdep.c
@@ -62,7 +62,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
        spin_lock_irq(&oxfw->lock);
        if (oxfw->dev_lock_changed)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&oxfw->lock);
diff --git a/sound/firewire/tascam/tascam-hwdep.c b/sound/firewire/tascam/tascam-hwdep.c
index 37b21647b471..4e4c1e9020e8 100644
--- a/sound/firewire/tascam/tascam-hwdep.c
+++ b/sound/firewire/tascam/tascam-hwdep.c
@@ -60,7 +60,7 @@ static __poll_t hwdep_poll(struct snd_hwdep *hwdep, struct file *file,
        spin_lock_irq(&tscm->lock);
        if (tscm->dev_lock_changed)
-                events = POLLIN | POLLRDNORM;
+                events = EPOLLIN | EPOLLRDNORM;
        else
                events = 0;
        spin_unlock_irq(&tscm->lock);
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index 6b57f8aac1b7..8c0f8a9ee0ba 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -684,7 +684,7 @@ static __poll_t sq_poll(struct file *file, struct poll_table_struct *wait)
                poll_wait(file, &write_sq.action_queue, wait);
        if (file->f_mode & FMODE_WRITE)
                if (write_sq.count < write_sq.max_active || write_sq.block_size - write_sq.rear_size > 0)
-                        mask |= POLLOUT | POLLWRNORM;
+                        mask |= EPOLLOUT | EPOLLWRNORM;
        return mask;
 }
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index 05ccc7fdcc09..56537a156580 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -246,7 +246,7 @@ static __poll_t snd_usb_sbrc_hwdep_poll(struct snd_hwdep *hw, struct file *file,
        struct usb_mixer_interface *mixer = hw->private_data;
        poll_wait(file, &mixer->rc_waitq, wait);
-        return mixer->rc_code ? POLLIN | POLLRDNORM : 0;
+        return mixer->rc_code ? EPOLLIN | EPOLLRDNORM : 0;
 }
 static int snd_usb_soundblaster_remote_init(struct usb_mixer_interface *mixer)
diff --git a/sound/usb/usx2y/us122l.c b/sound/usb/usx2y/us122l.c
index e2be10d17118..ebcab5c5465d 100644
--- a/sound/usb/usx2y/us122l.c
+++ b/sound/usb/usx2y/us122l.c
@@ -280,7 +280,7 @@ static __poll_t usb_stream_hwdep_poll(struct snd_hwdep *hw,
        poll_wait(file, &us122l->sk.sleep, wait);
-        mask = POLLIN | POLLOUT | POLLWRNORM | POLLERR;
+        mask = EPOLLIN | EPOLLOUT | EPOLLWRNORM | EPOLLERR;
        if (mutex_trylock(&us122l->mutex)) {
                struct usb_stream *s = us122l->sk.s;
                if (s && s->state == usb_stream_ready) {
@@ -290,7 +290,7 @@ static __poll_t usb_stream_hwdep_poll(struct snd_hwdep *hw,
                                polled = &us122l->second_periods_polled;
                        if (*polled != s->periods_done) {
                                *polled = s->periods_done;
-                                mask = POLLIN | POLLOUT | POLLWRNORM;
+                                mask = EPOLLIN | EPOLLOUT | EPOLLWRNORM;
                        } else
                                mask = 0;
                }
diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index 07d15bae75bc..d8bd7c99b48c 100644
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -92,12 +92,12 @@ static __poll_t snd_us428ctls_poll(struct snd_hwdep *hw, struct file *file, poll
        struct usX2Ydev *us428 = hw->private_data;
        struct us428ctls_sharedmem *shm = us428->us428ctls_sharedmem;
        if (us428->chip_status & USX2Y_STAT_CHIP_HUP)
-                return POLLHUP;
+                return EPOLLHUP;
        poll_wait(file, &us428->us428ctls_wait_queue_head, wait);
        if (shm != NULL && shm->CtlSnapShotLast != shm->CtlSnapShotRed)
-                mask |= POLLIN;
+                mask |= EPOLLIN;
        return mask;
 }
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index a334399fafec..6e865e8b5b10 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -194,7 +194,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
        unsigned seq;
        int idx;
-        if (flags & POLLIN) {
+        if (flags & EPOLLIN) {
                idx = srcu_read_lock(&kvm->irq_srcu);
                do {
                        seq = read_seqcount_begin(&irqfd->irq_entry_sc);
@@ -208,7 +208,7 @@ irqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)
                srcu_read_unlock(&kvm->irq_srcu, idx);
        }
-        if (flags & POLLHUP) {
+        if (flags & EPOLLHUP) {
                /* The eventfd is closing, detach from KVM */
                unsigned long flags;
@@ -399,12 +399,12 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
         */
        events = f.file->f_op->poll(f.file, &irqfd->pt);
-        if (events & POLLIN)
+        if (events & EPOLLIN)
                schedule_work(&irqfd->inject);
        /*
         * do not drop the file until the irqfd is fully initialized, otherwise
-         * we might race against the POLLHUP
+         * we might race against the EPOLLHUP
         */
        fdput(f);
 #ifdef CONFIG_HAVE_KVM_IRQ_BYPASS