Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[muen/linux.git] / kernel / cgroup / cgroup.c

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 7fd9f22e406d7646706d00288ccea4f2b753c33c..cef98502b124b8fc60c62b39b61f0d53334ce23c 100644 (file)
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -5997,7 +5997,7 @@ int cgroup_bpf_detach(struct cgroup *cgrp, struct bpf_prog *prog,
        int ret;
 
        mutex_lock(&cgroup_mutex);
-       ret = __cgroup_bpf_detach(cgrp, prog, type, flags);
+       ret = __cgroup_bpf_detach(cgrp, prog, type);
        mutex_unlock(&cgroup_mutex);
        return ret;
 }