diff -rupN vsock-only/linux/af_vsock.c vsock-only-c/linux/af_vsock.c
--- vsock-only/linux/af_vsock.c	2015-11-24 22:10:45.393933681 +0100
+++ vsock-only-c/linux/af_vsock.c	2015-11-24 22:03:18.600857648 +0100
@@ -232,13 +232,11 @@ static int VSockVmciStreamSetsockopt(str
 static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname,
                                      char __user *optval, int __user * optlen);

-static int VSockVmciDgramSendmsg(struct kiocb *kiocb,
-                                 struct socket *sock, struct msghdr *msg, size_t len);
-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock,
+static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
+static int VSockVmciDgramRecvmsg(struct socket *sock,
                                  struct msghdr *msg, size_t len, int flags);
-static int VSockVmciStreamSendmsg(struct kiocb *kiocb,
-                                 struct socket *sock, struct msghdr *msg, size_t len);
-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock,
+static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len);
+static int VSockVmciStreamRecvmsg(struct socket *sock,
                                  struct msghdr *msg, size_t len, int flags);

 static int VSockVmciCreate(
@@ -4210,8 +4208,7 @@ VSockVmciShutdown(struct socket *sock,
  */

 static int
-VSockVmciDgramSendmsg(struct kiocb *kiocb,          // UNUSED
-                      struct socket *sock,          // IN: socket to send on
+VSockVmciDgramSendmsg(struct socket *sock,          // IN: socket to send on
                       struct msghdr *msg,           // IN: message to send
                       size_t len)                   // IN: length of message
 {
@@ -4540,8 +4537,7 @@ VSockVmciStreamGetsockopt(struct socket
  */

 static int
-VSockVmciStreamSendmsg(struct kiocb *kiocb,          // UNUSED
-                       struct socket *sock,          // IN: socket to send on
+VSockVmciStreamSendmsg(struct socket *sock,          // IN: socket to send on
                        struct msghdr *msg,           // IN: message to send
                        size_t len)                   // IN: length of message
 {
@@ -4709,8 +4705,7 @@ out:
  */

 static int
-VSockVmciDgramRecvmsg(struct kiocb *kiocb,          // UNUSED
-                      struct socket *sock,          // IN: socket to receive from
+VSockVmciDgramRecvmsg(struct socket *sock,          // IN: socket to receive from
                       struct msghdr *msg,           // IN/OUT: message to receive into
                       size_t len,                   // IN: length of receive buffer
                       int flags)                    // IN: receive flags
@@ -4804,8 +4799,7 @@ out:
  */

 static int
-VSockVmciStreamRecvmsg(struct kiocb *kiocb,          // UNUSED
-                       struct socket *sock,          // IN: socket to receive from
+VSockVmciStreamRecvmsg(struct socket *sock,          // IN: socket to receive from
                        struct msghdr *msg,           // IN/OUT: message to receive into
                        size_t len,                   // IN: length of receive buffer
                        int flags)                    // IN: receive flags