Merge tag 'trace-fixes-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[firefly-linux-kernel-4.4.55.git] / net / x25 / af_x25.c

diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index c3ab230e4493fbb0d63b50c3befe1d15aeda802e..a750f330b8ddca8e0ea3e5d8eb88e68f6038e149 100644 (file)
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -515,10 +515,10 @@ static struct proto x25_proto = {
        .obj_size = sizeof(struct x25_sock),
 };
 
-static struct sock *x25_alloc_socket(struct net *net)
+static struct sock *x25_alloc_socket(struct net *net, int kern)
 {
        struct x25_sock *x25;
-       struct sock *sk = sk_alloc(net, AF_X25, GFP_ATOMIC, &x25_proto);
+       struct sock *sk = sk_alloc(net, AF_X25, GFP_ATOMIC, &x25_proto, kern);
 
        if (!sk)
                goto out;
@@ -553,7 +553,7 @@ static int x25_create(struct net *net, struct socket *sock, int protocol,
                goto out;
 
        rc = -ENOBUFS;
-       if ((sk = x25_alloc_socket(net)) == NULL)
+       if ((sk = x25_alloc_socket(net, kern)) == NULL)
                goto out;
 
        x25 = x25_sk(sk);
@@ -602,7 +602,7 @@ static struct sock *x25_make_new(struct sock *osk)
        if (osk->sk_type != SOCK_SEQPACKET)
                goto out;
 
-       if ((sk = x25_alloc_socket(sock_net(osk))) == NULL)
+       if ((sk = x25_alloc_socket(sock_net(osk), 0)) == NULL)
                goto out;
 
        x25 = x25_sk(sk);