VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2018-01-30 17:58:07 -0800 committer: Linus Torvalds <torvalds@linux-foundation.org> 2018-01-30 17:58:07 -0800 commit: 168fe32a072a4b8dc81a3aebf0e5e588d38e2955 parent: 13ddd1667e7f01071cdf120132238ffca004a88e

Commit Summary:

Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Diffstat:

1 file changed, 2 insertions, 2 deletions

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 17bc8b874d92..3bc5bb7d6827 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -519,10 +519,10 @@ static int mqueue_flush_file(struct file *filp, fl_owner_t id)
 	return 0;
 }
 
-static unsigned int mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab)
+static __poll_t mqueue_poll_file(struct file *filp, struct poll_table_struct *poll_tab)
 {
 	struct mqueue_inode_info *info = MQUEUE_I(file_inode(filp));
-	int retval = 0;
+	__poll_t retval = 0;
 
 	poll_wait(filp, &info->wait_q, poll_tab);