From mboxrd@z Thu Jan 1 00:00:00 1970 From: Konstantin Khorenko Date: Fri, 21 Aug 2026 18:42:06 +0200 Subject: [Devel] [PATCH RHEL10 COMMIT] sched/core: guard cpu_cgrp_subsys.depends_on with CONFIG_CGROUP_CPUACCT In-Reply-To: <20260821163718.187766-3-khorenko@virtuozzo.com> Message-ID: <202608211642.67LGg6HP666546@f0.sw.ru> List-Id: The commit is pushed to "branch-rh10-6.12.0-211.39.1.16.x.vz10-ovz" and will appear at git at bitbucket.org:openvz/vzkernel.git after rh10-6.12.0-211.39.1.16.6.vz10 ------> commit 9ce0ac5c94b699acee8b79cb0685d38f7b5aea5c Author: Eva Kurchatova Date: Fri Aug 21 18:36:48 2026 +0200 sched/core: guard cpu_cgrp_subsys.depends_on with CONFIG_CGROUP_CPUACCT cpuacct_cgrp_id is only declared when CONFIG_CGROUP_CPUACCT is enabled - SUBSYS(cpuacct) in include/linux/cgroup_subsys.h sits under IS_ENABLED(CONFIG_CGROUP_CPUACCT) - while the cpu controller itself is built whenever CONFIG_CGROUP_SCHED is set. With CONFIG_CGROUP_SCHED=y and CONFIG_CGROUP_CPUACCT=n the initializer does not compile: kernel/sched/core.c: error: 'cpuacct_cgrp_id' undeclared here (not in a function) There is nothing for the cpu controller to depend on when cpuacct is not built, so simply drop the dependency in that configuration. Fixes: 776275586407 ("cgroup: allow cpuacct to be enabled in v2 hierarchy") Feature: sched: emulate virtual cpus for Containers https://virtuozzo.atlassian.net/browse/VSTOR-134732 Signed-off-by: Eva Kurchatova Signed-off-by: Konstantin Khorenko --- kernel/sched/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index d5b4d8c97a0c7..7d2214749245b 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -10441,7 +10441,9 @@ struct cgroup_subsys cpu_cgrp_subsys = { .dfl_cftypes = cpu_files, .early_init = true, .threaded = true, +#ifdef CONFIG_CGROUP_CPUACCT .depends_on = 1 << cpuacct_cgrp_id, +#endif }; #endif /* CONFIG_CGROUP_SCHED */