diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-14 22:52:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-14 22:52:46 -0700 |
| commit | fea069152614cdeefba4b2bf80afcddb9c217fc8 (patch) | |
| tree | 97a4ca0c1afabe94b69110409a46347a093cff45 /drivers | |
| parent | 5f6c01819979afbfec7e0b15fe52371b8eed87e8 (diff) | |
| parent | a8d3782f9ea7574b8648e69bbb05a0b1d93e437e (diff) | |
| download | kernel_samsung_espresso10-fea069152614cdeefba4b2bf80afcddb9c217fc8.zip kernel_samsung_espresso10-fea069152614cdeefba4b2bf80afcddb9c217fc8.tar.gz kernel_samsung_espresso10-fea069152614cdeefba4b2bf80afcddb9c217fc8.tar.bz2 | |
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/vhost/net.c | 4 | ||||
| -rw-r--r-- | drivers/vhost/vhost.c | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 9777583..aa88911 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -642,7 +642,7 @@ static struct miscdevice vhost_net_misc = { &vhost_net_fops, }; -int vhost_net_init(void) +static int vhost_net_init(void) { int r = vhost_init(); if (r) @@ -659,7 +659,7 @@ err_init: } module_init(vhost_net_init); -void vhost_net_exit(void) +static void vhost_net_exit(void) { misc_deregister(&vhost_net_misc); vhost_cleanup(); diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index e69d238..5c9c657 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c @@ -715,8 +715,8 @@ int vhost_log_write(struct vhost_virtqueue *vq, struct vhost_log *log, return 0; } -int translate_desc(struct vhost_dev *dev, u64 addr, u32 len, - struct iovec iov[], int iov_size) +static int translate_desc(struct vhost_dev *dev, u64 addr, u32 len, + struct iovec iov[], int iov_size) { const struct vhost_memory_region *reg; struct vhost_memory *mem; @@ -741,7 +741,7 @@ int translate_desc(struct vhost_dev *dev, u64 addr, u32 len, _iov = iov + ret; size = reg->memory_size - addr + reg->guest_phys_addr; _iov->iov_len = min((u64)len, size); - _iov->iov_base = (void *)(unsigned long) + _iov->iov_base = (void __user *)(unsigned long) (reg->userspace_addr + addr - reg->guest_phys_addr); s += size; addr += size; @@ -995,7 +995,7 @@ void vhost_discard_vq_desc(struct vhost_virtqueue *vq) * want to notify the guest, using eventfd. */ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) { - struct vring_used_elem *used; + struct vring_used_elem __user *used; /* The virtqueue contains a ring of used buffers. Get a pointer to the * next entry in that used ring. */ @@ -1019,7 +1019,8 @@ int vhost_add_used(struct vhost_virtqueue *vq, unsigned int head, int len) smp_wmb(); /* Log used ring entry write. */ log_write(vq->log_base, - vq->log_addr + ((void *)used - (void *)vq->used), + vq->log_addr + + ((void __user *)used - (void __user *)vq->used), sizeof *used); /* Log used index update. */ log_write(vq->log_base, |