diff options
author | David S. Miller <davem@davemloft.net> | 2018-01-09 10:37:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-09 10:37:00 -0500 |
commit | a0ce093180f2bbb832b3f5583adc640ad67ea568 (patch) | |
tree | 62c9aca5be3566ea4810e4584a02870de8b953f8 /kernel/bpf/syscall.c | |
parent | f4803f1b73f877a571be4c8e531dfcf190acc691 (diff) | |
parent | ef7f8cec80a0ba7bd00ece46844c8994117dc910 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'kernel/bpf/syscall.c')
-rw-r--r-- | kernel/bpf/syscall.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index ebf0fb23e237..2bac0dc8baba 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c | |||
@@ -1068,7 +1068,7 @@ struct bpf_prog *bpf_prog_inc_not_zero(struct bpf_prog *prog) | |||
1068 | } | 1068 | } |
1069 | EXPORT_SYMBOL_GPL(bpf_prog_inc_not_zero); | 1069 | EXPORT_SYMBOL_GPL(bpf_prog_inc_not_zero); |
1070 | 1070 | ||
1071 | static bool bpf_prog_get_ok(struct bpf_prog *prog, | 1071 | bool bpf_prog_get_ok(struct bpf_prog *prog, |
1072 | enum bpf_prog_type *attach_type, bool attach_drv) | 1072 | enum bpf_prog_type *attach_type, bool attach_drv) |
1073 | { | 1073 | { |
1074 | /* not an attachment, just a refcount inc, always allow */ | 1074 | /* not an attachment, just a refcount inc, always allow */ |