diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-04 17:57:34 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-07-04 17:57:34 +1000 |
| commit | e10213607bbb91a6f4396739410f9dbbb3a6f4cd (patch) | |
| tree | fdfa2e55497e5f64264ae851f70d9713a21a2f24 /net | |
| parent | e0862084cd5ff6ac1d4e0ee31195edc431bb3167 (diff) | |
| parent | 36ac8116836c823edb55ae062fd98834bdcd5b69 (diff) | |
| download | linux-next-e10213607bbb91a6f4396739410f9dbbb3a6f4cd.tar.gz | |
Merge branch 'akpm-current/current'
Diffstat (limited to 'net')
| -rw-r--r-- | net/unix/af_unix.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 735362c26c8e..f1dffe84f0d5 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -769,6 +769,7 @@ static struct sock *unix_create1(struct net *net, struct socket *sock, int kern) lockdep_set_class(&sk->sk_receive_queue.lock, &af_unix_sk_receive_queue_lock_key); + sk->sk_allocation = GFP_KERNEL_ACCOUNT; sk->sk_write_space = unix_write_space; sk->sk_max_ack_backlog = net->unx.sysctl_max_dgram_qlen; sk->sk_destruct = unix_sock_destructor; |