diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-24 22:47:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-24 22:47:27 +0200 |
| commit | 13209a8f7304a34158f4366e8ea07a1965c05ac7 (patch) | |
| tree | f25ba4846fe02a32d4a14ef1a6be3227363da919 /drivers/vhost | |
| parent | ethtool: propagate get_coalesce return value (diff) | |
| parent | Merge tag 'efi-urgent-2020-05-24' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.tar.xz linux-13209a8f7304a34158f4366e8ea07a1965c05ac7.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The MSCC bug fix in 'net' had to be slightly adjusted because the
register accesses are done slightly differently in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/vhost')
| -rw-r--r-- | drivers/vhost/vhost.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index d450e16c5c25..21a59b598ed8 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -730,7 +730,7 @@ static inline void __user *vhost_vq_meta_fetch(struct vhost_virtqueue *vq, if (!map) return NULL; - return (void *)(uintptr_t)(map->addr + addr - map->start); + return (void __user *)(uintptr_t)(map->addr + addr - map->start); } /* Can we switch to this memory table? */ @@ -869,7 +869,7 @@ static void __user *__vhost_get_user_slow(struct vhost_virtqueue *vq, * not happen in this case. */ static inline void __user *__vhost_get_user(struct vhost_virtqueue *vq, - void *addr, unsigned int size, + void __user *addr, unsigned int size, int type) { void __user *uaddr = vhost_vq_meta_fetch(vq, |