git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
net
/
core
/
lwt_bpf.c
diff --git
a/net/core/lwt_bpf.c
b/net/core/lwt_bpf.c
index e7e626fb87bb34f89014cb16e58aaaf132c65417..e45098593dc00f6b8dadb5df01d91cf5cda64fc3 100644
(file)
--- a/
net/core/lwt_bpf.c
+++ b/
net/core/lwt_bpf.c
@@
-217,7
+217,7
@@
static int bpf_parse_prog(struct nlattr *attr, struct bpf_lwt_prog *prog,
if (!tb[LWT_BPF_PROG_FD] || !tb[LWT_BPF_PROG_NAME])
return -EINVAL;
- prog->name = nla_memdup(tb[LWT_BPF_PROG_NAME], GFP_
KERNEL
);
+ prog->name = nla_memdup(tb[LWT_BPF_PROG_NAME], GFP_
ATOMIC
);
if (!prog->name)
return -ENOMEM;