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 tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
kernel
/
bpf
/
cgroup.c
diff --git
a/kernel/bpf/cgroup.c
b/kernel/bpf/cgroup.c
index 9425c2fb872f78f1a0c6cb1bcd00019e78c741ba..ab612fe9862f0668b566722c413d366d598f10ca 100644
(file)
--- a/
kernel/bpf/cgroup.c
+++ b/
kernel/bpf/cgroup.c
@@
-718,6
+718,7
@@
cgroup_dev_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog)
case BPF_FUNC_trace_printk:
if (capable(CAP_SYS_ADMIN))
return bpf_get_trace_printk_proto();
+ /* fall through */
default:
return NULL;
}