From 1bd8a72b11818535b18984227ec1d707e6605e71 Mon Sep 17 00:00:00 2001 From: Joseph Qi Date: Fri, 3 Jan 2020 09:33:07 +0800 Subject: [PATCH 0384/2944] alinux: psi: using cpuacct_cgrp_id under CONFIG_CGROUP_CPUACCT This is to fix the build error if CONFIG_CGROUP_CPUACCT is not enabled. kernel/sched/psi.c: In function 'iterate_groups': kernel/sched/psi.c:732:31: error: 'cpuacct_cgrp_id' undeclared (first use in this function); did you mean 'cpuacct_charge'? Reported-by: kbuild test robot Fixes: 1f49a7385032 ("alinux: psi: Support PSI under cgroup v1") Signed-off-by: Joseph Qi Reviewed-by: Xunlei Pang --- kernel/sched/psi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index f65a772..dfdce4c 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -729,7 +729,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 -- 1.8.3.1