diff options
| author | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 08:12:33 (GMT) |
|---|---|---|
| committer | Xie Xiaobo <xiaobo.xie@nxp.com> | 2017-12-12 08:12:33 (GMT) |
| commit | c0246a9ec4d461ef4dd7647f94005380bb9e7f0b (patch) | |
| tree | 7588601aa6ce98f5e9fd083a1b351d9023c0b295 /net/tipc/name_distr.c | |
| parent | 50fd1a6d79d48a7c35890aecce5a5d6b872a461d (diff) | |
| parent | 56f4a560c6d6318b5a8e18a1b3e44909a5158d1e (diff) | |
| download | linux-c0246a9ec4d461ef4dd7647f94005380bb9e7f0b.tar.xz | |
Merge Linaro linux 4.9.62 into linux-4.9
Signed-off-by: Xiaobo Xie <xiaobo.xie@nxp.com>
Diffstat (limited to 'net/tipc/name_distr.c')
| -rw-r--r-- | net/tipc/name_distr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index c1cfd92..23f8899 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c @@ -69,7 +69,7 @@ static struct sk_buff *named_prepare_buf(struct net *net, u32 type, u32 size, u32 dest) { struct tipc_net *tn = net_generic(net, tipc_net_id); - struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE + size); + struct sk_buff *buf = tipc_buf_acquire(INT_H_SIZE + size, GFP_ATOMIC); struct tipc_msg *msg; if (buf != NULL) { |