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

[linux-2.6-block.git] / ipc / mqueue.c

diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index 17bc8b874d925b5ff0fbe041567cce99fba04e73..3bc5bb7d68274ed3eddfd5d1c0b71dcf7ce7200b 100644 (file)
--- 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);