diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/bpf/cgroup.c | 3 | ||||
-rw-r--r-- | kernel/cgroup/cgroup.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index ab612fe9862f..d78cfec5807d 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c | |||
@@ -230,6 +230,7 @@ cleanup: | |||
230 | * @cgrp: The cgroup which descendants to traverse | 230 | * @cgrp: The cgroup which descendants to traverse |
231 | * @prog: A program to attach | 231 | * @prog: A program to attach |
232 | * @type: Type of attach operation | 232 | * @type: Type of attach operation |
233 | * @flags: Option flags | ||
233 | * | 234 | * |
234 | * Must be called with cgroup_mutex held. | 235 | * Must be called with cgroup_mutex held. |
235 | */ | 236 | */ |
@@ -363,7 +364,7 @@ cleanup: | |||
363 | * Must be called with cgroup_mutex held. | 364 | * Must be called with cgroup_mutex held. |
364 | */ | 365 | */ |
365 | int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, | 366 | int __cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, |
366 | enum bpf_attach_type type, u32 unused_flags) | 367 | enum bpf_attach_type type) |
367 | { | 368 | { |
368 | struct list_head *progs = &cgrp->bpf.progs[type]; | 369 | struct list_head *progs = &cgrp->bpf.progs[type]; |
369 | enum bpf_cgroup_storage_type stype; | 370 | enum bpf_cgroup_storage_type stype; |
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index f31bd61c9466..9f617605dacb 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c | |||
@@ -5996,7 +5996,7 @@ int cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog, | |||
5996 | int ret; | 5996 | int ret; |
5997 | 5997 | ||
5998 | mutex_lock(&cgroup_mutex); | 5998 | mutex_lock(&cgroup_mutex); |
5999 | ret = __cgroup_bpf_detach(cgrp, prog, type, flags); | 5999 | ret = __cgroup_bpf_detach(cgrp, prog, type); |
6000 | mutex_unlock(&cgroup_mutex); | 6000 | mutex_unlock(&cgroup_mutex); |
6001 | return ret; | 6001 | return ret; |
6002 | } | 6002 | } |