diff options
| -rw-r--r-- | drivers/vhost/vhost.c | 2 | ||||
| -rw-r--r-- | drivers/vhost/vhost.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 1b3e8d2d5c8b..5316319d8408 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c | |||
| @@ -1337,7 +1337,7 @@ err: | |||
| 1337 | return -EFAULT; | 1337 | return -EFAULT; |
| 1338 | } | 1338 | } |
| 1339 | 1339 | ||
| 1340 | long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp) | 1340 | long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp) |
| 1341 | { | 1341 | { |
| 1342 | struct file *eventfp, *filep = NULL; | 1342 | struct file *eventfp, *filep = NULL; |
| 1343 | bool pollstart = false, pollstop = false; | 1343 | bool pollstart = false, pollstop = false; |
diff --git a/drivers/vhost/vhost.h b/drivers/vhost/vhost.h index ac4b6056f19a..d8ee85ae8fdc 100644 --- a/drivers/vhost/vhost.h +++ b/drivers/vhost/vhost.h | |||
| @@ -45,7 +45,7 @@ void vhost_poll_stop(struct vhost_poll *poll); | |||
| 45 | void vhost_poll_flush(struct vhost_poll *poll); | 45 | void vhost_poll_flush(struct vhost_poll *poll); |
| 46 | void vhost_poll_queue(struct vhost_poll *poll); | 46 | void vhost_poll_queue(struct vhost_poll *poll); |
| 47 | void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work); | 47 | void vhost_work_flush(struct vhost_dev *dev, struct vhost_work *work); |
| 48 | long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp); | 48 | long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp); |
| 49 | 49 | ||
| 50 | struct vhost_log { | 50 | struct vhost_log { |
| 51 | u64 addr; | 51 | u64 addr; |
| @@ -177,7 +177,7 @@ void vhost_dev_reset_owner(struct vhost_dev *, struct vhost_umem *); | |||
| 177 | void vhost_dev_cleanup(struct vhost_dev *); | 177 | void vhost_dev_cleanup(struct vhost_dev *); |
| 178 | void vhost_dev_stop(struct vhost_dev *); | 178 | void vhost_dev_stop(struct vhost_dev *); |
| 179 | long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp); | 179 | long vhost_dev_ioctl(struct vhost_dev *, unsigned int ioctl, void __user *argp); |
| 180 | long vhost_vring_ioctl(struct vhost_dev *d, int ioctl, void __user *argp); | 180 | long vhost_vring_ioctl(struct vhost_dev *d, unsigned int ioctl, void __user *argp); |
| 181 | int vhost_vq_access_ok(struct vhost_virtqueue *vq); | 181 | int vhost_vq_access_ok(struct vhost_virtqueue *vq); |
| 182 | int vhost_log_access_ok(struct vhost_dev *); | 182 | int vhost_log_access_ok(struct vhost_dev *); |
| 183 | 183 | ||
