diff --git a/[refs] b/[refs] index 7ade3273b56d..93c608b78063 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5264481c8049673e2cc8c7aca410931f571ba2d +refs/heads/master: 5309fbcc475084e6c1566084f770cef927937b7b diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c index 54c836a2216b..5ac052693554 100644 --- a/trunk/net/core/sock.c +++ b/trunk/net/core/sock.c @@ -942,7 +942,6 @@ static void sk_prot_free(struct proto *prot, struct sock *sk) * @family: protocol family * @priority: for allocation (%GFP_KERNEL, %GFP_ATOMIC, etc) * @prot: struct proto associated with this new sock instance - * @zero_it: if we should zero the newly allocated sock */ struct sock *sk_alloc(struct net *net, int family, gfp_t priority, struct proto *prot)