Merge tag 'powerpc-4.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / drivers / misc / cxl / file.c

diff --git a/drivers/misc/cxl/file.c b/drivers/misc/cxl/file.c
index 93fd381..0162516 100644 (file)
--- a/drivers/misc/cxl/file.c
+++ b/drivers/misc/cxl/file.c
@@ -365,10 +365,10 @@ static inline bool ctx_event_pending(struct cxl_context *ctx)
        return false;
 }
 
-unsigned int afu_poll(struct file *file, struct poll_table_struct *poll)
+__poll_t afu_poll(struct file *file, struct poll_table_struct *poll)
 {
        struct cxl_context *ctx = file->private_data;
-       int mask = 0;
+       __poll_t mask = 0;
        unsigned long flags;