diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-11 17:36:06 -0500 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-15 16:49:23 -0500 |
| commit | b97a8a90067896f99f0d636dbc2b89a953123fad (patch) | |
| tree | e1d5d749122bc64b8b485737534150d3894a31f1 | |
| parent | 8dc32b292d157a0c9a0d39b3839a59bd7fd13199 (diff) | |
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) | |||
| 577 | * Returns an error if num is invalid: you should check pointers | 577 | * Returns an error if num is invalid: you should check pointers |
| 578 | * yourself! | 578 | * yourself! |
| 579 | */ | 579 | */ |
| 580 | int vringh_init_user(struct vringh *vrh, u32 features, | 580 | int vringh_init_user(struct vringh *vrh, u64 features, |
| 581 | unsigned int num, bool weak_barriers, | 581 | unsigned int num, bool weak_barriers, |
| 582 | struct vring_desc __user *desc, | 582 | struct vring_desc __user *desc, |
| 583 | struct vring_avail __user *avail, | 583 | struct vring_avail __user *avail, |
| @@ -836,7 +836,7 @@ static inline int xfer_kern(void *src, void *dst, size_t len) | |||
| 836 | * | 836 | * |
| 837 | * Returns an error if num is invalid. | 837 | * Returns an error if num is invalid. |
| 838 | */ | 838 | */ |
| 839 | int vringh_init_kern(struct vringh *vrh, u32 features, | 839 | int vringh_init_kern(struct vringh *vrh, u64 features, |
| 840 | unsigned int num, bool weak_barriers, | 840 | unsigned int num, bool weak_barriers, |
| 841 | struct vring_desc *desc, | 841 | struct vring_desc *desc, |
| 842 | struct vring_avail *avail, | 842 | 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 { | |||
| 105 | #define VRINGH_IOV_ALLOCATED 0x8000000 | 105 | #define VRINGH_IOV_ALLOCATED 0x8000000 |
| 106 | 106 | ||
| 107 | /* Helpers for userspace vrings. */ | 107 | /* Helpers for userspace vrings. */ |
| 108 | int vringh_init_user(struct vringh *vrh, u32 features, | 108 | int vringh_init_user(struct vringh *vrh, u64 features, |
| 109 | unsigned int num, bool weak_barriers, | 109 | unsigned int num, bool weak_barriers, |
| 110 | struct vring_desc __user *desc, | 110 | struct vring_desc __user *desc, |
| 111 | struct vring_avail __user *avail, | 111 | struct vring_avail __user *avail, |
| @@ -167,7 +167,7 @@ bool vringh_notify_enable_user(struct vringh *vrh); | |||
| 167 | void vringh_notify_disable_user(struct vringh *vrh); | 167 | void vringh_notify_disable_user(struct vringh *vrh); |
| 168 | 168 | ||
| 169 | /* Helpers for kernelspace vrings. */ | 169 | /* Helpers for kernelspace vrings. */ |
| 170 | int vringh_init_kern(struct vringh *vrh, u32 features, | 170 | int vringh_init_kern(struct vringh *vrh, u64 features, |
| 171 | unsigned int num, bool weak_barriers, | 171 | unsigned int num, bool weak_barriers, |
| 172 | struct vring_desc *desc, | 172 | struct vring_desc *desc, |
| 173 | struct vring_avail *avail, | 173 | struct vring_avail *avail, |
