summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAsias He <asias@redhat.com>2013-08-19 03:23:19 +0200
committerDavid S. Miller <davem@davemloft.net>2013-08-21 00:05:04 +0200
commit35596b2796713c6a9dc05759837fa9f0e156a200 (patch)
tree98cfa9d8437a405da8e05a2f6b311f9273ffae2c
parenttcp: trivial: Remove nocache argument from tcp_v4_send_synack (diff)
downloadlinux-35596b2796713c6a9dc05759837fa9f0e156a200.tar.xz
linux-35596b2796713c6a9dc05759837fa9f0e156a200.zip
vhost: Include linux/uio.h instead of linux/socket.h
memcpy_fromiovec is moved from net/core/iovec.c to lib/iovec.c. linux/uio.h provides the declaration for memcpy_fromiovec. Include linux/uio.h instead of inux/socket.h for it. Signed-off-by: Asias He <asias@redhat.com> Acked-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/vhost/vhost.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index e58cf0001cee..448efe01f18a 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -13,7 +13,7 @@
#include <linux/eventfd.h>
#include <linux/vhost.h>
-#include <linux/socket.h> /* memcpy_fromiovec */
+#include <linux/uio.h>
#include <linux/mm.h>
#include <linux/mmu_context.h>
#include <linux/miscdevice.h>