Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

[muen/linux.git] / drivers / vhost / vhost.h

diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h
index 45d12b01cfe4e95a190dc9864ae8fc8547dc137b..ac4b6056f19ae4cab825fb7c0868017a9121fd86 100644 (file)
--- a/drivers/vhost/vhost.h
+++ b/drivers/vhost/vhost.h
@@ -30,7 +30,7 @@ struct vhost_poll {
        wait_queue_head_t        *wqh;
        wait_queue_entry_t              wait;
        struct vhost_work         work;
        wait_queue_head_t        *wqh;
        wait_queue_entry_t              wait;
        struct vhost_work         work;

-       unsigned long             mask;
+       __poll_t                  mask;

        struct vhost_dev         *dev;
 };
 
        struct vhost_dev         *dev;
 };
 


@@ -39,7 +39,7 @@ void vhost_work_queue(struct vhost_dev *dev, struct vhost_work *work);
 bool vhost_has_work(struct vhost_dev *dev);
 
 void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn,
 bool vhost_has_work(struct vhost_dev *dev);
 
 void vhost_poll_init(struct vhost_poll *poll, vhost_work_fn_t fn,

-                    unsigned long mask, struct vhost_dev *dev);
+                    __poll_t mask, struct vhost_dev *dev);

 int vhost_poll_start(struct vhost_poll *poll, struct file *file);
 void vhost_poll_stop(struct vhost_poll *poll);
 void vhost_poll_flush(struct vhost_poll *poll);
 int vhost_poll_start(struct vhost_poll *poll, struct file *file);
 void vhost_poll_stop(struct vhost_poll *poll);
 void vhost_poll_flush(struct vhost_poll *poll);


@@ -210,7 +210,7 @@ void vhost_enqueue_msg(struct vhost_dev *dev,
                       struct vhost_msg_node *node);
 struct vhost_msg_node *vhost_dequeue_msg(struct vhost_dev *dev,
                                         struct list_head *head);
                       struct vhost_msg_node *node);
 struct vhost_msg_node *vhost_dequeue_msg(struct vhost_dev *dev,
                                         struct list_head *head);

-unsigned int vhost_chr_poll(struct file *file, struct vhost_dev *dev,
+__poll_t vhost_chr_poll(struct file *file, struct vhost_dev *dev,

                            poll_table *wait);
 ssize_t vhost_chr_read_iter(struct vhost_dev *dev, struct iov_iter *to,
                            int noblock);
                            poll_table *wait);
 ssize_t vhost_chr_read_iter(struct vhost_dev *dev, struct iov_iter *to,
                            int noblock);