summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2022-06-27 18:10:16 +0900
committerTejun Heo <tj@kernel.org>2022-06-27 18:10:16 +0900
commit27924b13fcce42222e836394711fe1e7ec010cc6 (patch)
treeca36d72ad79c4e43ba4e0312f0a263cf33cb1bd7
parent507c8695c65aeea1e9ff67a76961c201dbd8e124 (diff)
parentd75cd55ae2dedeee5382bb48832c322673b9781c (diff)
downloadlinux-next-27924b13fcce42222e836394711fe1e7ec010cc6.tar.gz
linux-next-27924b13fcce42222e836394711fe1e7ec010cc6.zip
Merge branch 'for-5.20' into for-next
-rw-r--r--kernel/cgroup/cgroup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 411fb5c0a318..0235702e6a96 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -2568,10 +2568,6 @@ int cgroup_migrate_vet_dst(struct cgroup *dst_cgrp)
if (!cgroup_is_valid_domain(dst_cgrp->dom_cgrp))
return -EOPNOTSUPP;
- /* mixables don't care */
- if (cgroup_is_mixable(dst_cgrp))
- return 0;
-
/*
* If @dst_cgrp is already or can become a thread root or is
* threaded, it doesn't matter.