diff options
| author |   Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-12 21:59:01 -0700 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /net/atm/svc.c | |
| parent | device-dax: utilize new cdev_device_add helper function (diff) | |
| parent | x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions (diff) | |
| download | linux-dev-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.tar.xz linux-dev-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.zip | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'net/atm/svc.c')
| -rw-r--r-- | net/atm/svc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/atm/svc.c b/net/atm/svc.c index db9794ec61d8..5589de7086af 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -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; |