Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[sfrench/cifs-2.6.git] / drivers / infiniband / core / ucm.c

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index f3eb1c3b617d3e5889472272d16425cde7b51306..8ae636bb09e577a7089cce07c4c784df69190e00 100644 (file)
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1135,11 +1135,11 @@ static ssize_t ib_ucm_write(struct file *filp, const char __user *buf,
        return result;
 }
 
-static unsigned int ib_ucm_poll(struct file *filp,
+static __poll_t ib_ucm_poll(struct file *filp,
                                struct poll_table_struct *wait)
 {
        struct ib_ucm_file *file = filp->private_data;
-       unsigned int mask = 0;
+       __poll_t mask = 0;
 
        poll_wait(filp, &file->poll_wait, wait);