Merge tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs

[deliverable/linux.git] / drivers / vhost / net.c

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 8ca5ac71b8452210517c128b6b7c12e7af832b4f..027be91db139c43eaadd5e12727c2b18c1a65bcc 100644 (file)
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -168,7 +168,7 @@ static void vhost_net_clear_ubuf_info(struct vhost_net *n)
        }
 }
 
-int vhost_net_set_ubuf_info(struct vhost_net *n)
+static int vhost_net_set_ubuf_info(struct vhost_net *n)
 {
        bool zcopy;
        int i;
@@ -189,7 +189,7 @@ err:
        return -ENOMEM;
 }
 
-void vhost_net_vq_reset(struct vhost_net *n)
+static void vhost_net_vq_reset(struct vhost_net *n)
 {
        int i;