Commit efd726a9 authored Dec 31, 2021 by Joseph Qi Committed by Zheng Zengkai Dec 31, 2021

psi: using cpuacct_cgrp_id under CONFIG_CGROUP_CPUACCT

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4OF4N



------------------------------------------

Fix the build error if CONFIG_CGROUP_CPUACCT is not enabled.

Fixes: a885e3f9 ("psi: support psi under cgroup v1")
Signed-off-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Reviewed-by: Xunlei Pang <xlpang@linux.alibaba.com>
Signed-off-by: Chen Wandun <chenwandun@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parent d767c633

kernel/sched/psi.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -756,7 +756,11 @@ static struct psi_group iterate_groups(struct task_struct task, void **iter)
		if (static_branch_likely(&psi_v1_disabled))
		cgroup = task->cgroups->dfl_cgrp;
		else
		#ifdef CONFIG_CGROUP_CPUACCT
		cgroup = task_cgroup(task, cpuacct_cgrp_id);
		#else
		cgroup = NULL;
		#endif
		} else if (*iter == &psi_system)
		return NULL;
		else