From 166dfc4399643681f2e4277bf7b7407e926861e5 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Dec 2024 14:58:16 +0000 Subject: [PATCH] fixup! cgroup: Use kernel command line to disable memory cgroup cgroup features are distinct from cgroup subsystems - handle them correctly. Signed-off-by: Phil Elwell --- kernel/cgroup/cgroup.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -6769,11 +6769,19 @@ static int __init cgroup_enable(char *st strcmp(token, ss->legacy_name)) continue; - cgroup_feature_disable_mask &= ~(1 << i); static_branch_enable(cgroup_subsys_enabled_key[i]); pr_info("Enabling %s control group subsystem\n", ss->name); } + + for (i = 0; i < OPT_FEATURE_COUNT; i++) { + if (strcmp(token, cgroup_opt_feature_names[i])) + continue; + cgroup_feature_disable_mask &= ~(1 << i); + pr_info("Enabling %s control group feature\n", + cgroup_opt_feature_names[i]); + break; + } } return 1; }