Merge branch 'perf/urgent' into perf/core, to pick up fixes

[karo-tx-linux.git] / net / vmw_vsock / af_vsock.c

diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index 9192ead6675114128817267926befe23f7cc1111..9f770f33c10098fd3fcccfd9c739ab9a28a6b6f5 100644 (file)
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1250,7 +1250,8 @@ out:
        return err;
 }
 
-static int vsock_accept(struct socket *sock, struct socket *newsock, int flags)
+static int vsock_accept(struct socket *sock, struct socket *newsock, int flags,
+                       bool kern)
 {
        struct sock *listener;
        int err;