diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-12 00:36:06 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-15 23:49:23 +0200 |
| commit | b97a8a90067896f99f0d636dbc2b89a953123fad (patch) | |
| tree | e1d5d749122bc64b8b485737534150d3894a31f1 | |
| parent | 8dc32b292d157a0c9a0d39b3839a59bd7fd13199 (diff) | |
| download | linux-b97a8a90067896f99f0d636dbc2b89a953123fad.tar.bz2 | |
vringh: 64 bit features
Pass u64 everywhere.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | drivers/vhost/vringh.c | 4 | ||||
| -rw-r--r-- | include/linux/vringh.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c index 5174ebac288d..ac3fe2757961 100644 --- a/drivers/vhost/vringh.c +++ b/drivers/vhost/vringh.c @@ -577,7 +577,7 @@ static inline int xfer_to_user(void *dst, void *src, size_t len) * Returns an error if num is invalid: you should check pointers * yourself! */ -int vringh_init_user(struct vringh *vrh, u32 features, +int vringh_init_user(struct vringh *vrh, u64 features, unsigned int num, bool weak_barriers, struct vring_desc __user *desc, struct vring_avail __user *avail, @@ -836,7 +836,7 @@ static inline int xfer_kern(void *src, void *dst, size_t len) * * Returns an error if num is invalid. */ -int vringh_init_kern(struct vringh *vrh, u32 features, +int vringh_init_kern(struct vringh *vrh, u64 features, unsigned int num, bool weak_barriers, struct vring_desc *desc, struct vring_avail *avail, diff --git a/include/linux/vringh.h b/include/linux/vringh.h index 749cde28728b..f696dd0b6472 100644 --- a/include/linux/vringh.h +++ b/include/linux/vringh.h @@ -105,7 +105,7 @@ struct vringh_kiov { #define VRINGH_IOV_ALLOCATED 0x8000000 /* Helpers for userspace vrings. */ -int vringh_init_user(struct vringh *vrh, u32 features, +int vringh_init_user(struct vringh *vrh, u64 features, unsigned int num, bool weak_barriers, struct vring_desc __user *desc, struct vring_avail __user *avail, @@ -167,7 +167,7 @@ bool vringh_notify_enable_user(struct vringh *vrh); void vringh_notify_disable_user(struct vringh *vrh); /* Helpers for kernelspace vrings. */ -int vringh_init_kern(struct vringh *vrh, u32 features, +int vringh_init_kern(struct vringh *vrh, u64 features, unsigned int num, bool weak_barriers, struct vring_desc *desc, struct vring_avail *avail, |