Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs

[mirror_ubuntu-bionic-kernel.git] / net / atm / svc.c

diff --git a/net/atm/svc.c b/net/atm/svc.c
index 878563a8354d107cca5253b87fb4d434cb23a0ef..5589de7086af4eca7634e786918600a81cf6b09c 100644 (file)
--- a/net/atm/svc.c
+++ b/net/atm/svc.c
@@ -10,7 +10,7 @@
 #include <linux/kernel.h>      /* printk */
 #include <linux/skbuff.h>
 #include <linux/wait.h>
-#include <linux/sched.h>       /* jiffies and HZ */
+#include <linux/sched/signal.h>
 #include <linux/fcntl.h>       /* O_NONBLOCK */
 #include <linux/init.h>
 #include <linux/atm.h>         /* ATM stuff */
@@ -318,7 +318,8 @@ out:
        return error;
 }
 
-static int svc_accept(struct socket *sock, struct socket *newsock, int flags)
+static int svc_accept(struct socket *sock, struct socket *newsock, int flags,
+                     bool kern)
 {
        struct sock *sk = sock->sk;
        struct sk_buff *skb;
@@ -329,7 +330,7 @@ static int svc_accept(struct socket *sock, struct socket *newsock, int flags)
 
        lock_sock(sk);
 
-       error = svc_create(sock_net(sk), newsock, 0, 0);
+       error = svc_create(sock_net(sk), newsock, 0, kern);
        if (error)
                goto out;