diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-11 11:48:48 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-11 11:48:48 -0700 |
| commit | ae4d972f07f97de9a368a33820a7fe38284498c2 (patch) | |
| tree | 1623f306d0ce384e259cf36f2cab84dffbc9dcc2 /net/netlink/af_netlink.c | |
| parent | 24638027f19a0294d10dc9b49a2d21051030bc47 (diff) | |
| parent | 7e061af6db97a51e9c89bcef7c2317b13cc79699 (diff) | |
Merge "Merge branch 'android-4.4@9796ea8' into branch 'msm-4.4'"
Diffstat (limited to 'net/netlink/af_netlink.c')
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 96fe1c103bf9..2141d047301d 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -2087,7 +2087,7 @@ static int netlink_dump(struct sock *sk) if (!skb) { alloc_size = alloc_min_size; skb = netlink_alloc_skb(sk, alloc_size, nlk->portid, - (GFP_KERNEL & ~__GFP_DIRECT_RECLAIM)); + GFP_KERNEL); } if (!skb) goto errout_skb; |