[openeuler:OLK-6.6 2271/2356] kernel/sched/psi.c:908:31: error: use of undeclared identifier 'cpuacct_cgrp_id'; did you mean 'cpu_cgrp_id'?

[kernel test robot <lkp@intel.com>]

tree:   https://gitee.com/openeuler/kernel.git OLK-6.6
head:   ea6de9f6732d495c506f9c140b4ec17c957e1b77
commit: 2dfc29e742a07863c2426aea03d5c2c97b558b9d [2271/2356] sched/psi: Export cgroup psi from cgroupv2 to cgroupv1
config: x86_64-randconfig-005-20240111 (https://download.01.org/0day-ci/archive/20240112/202401120334.tGS5AHXP-lkp@intel.com/config)
compiler: ClangBuiltLinux clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240112/202401120334.tGS5AHXP-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202401120334.tGS5AHXP-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from kernel/sched/build_utility.c:97:
>> kernel/sched/psi.c:908:31: error: use of undeclared identifier 'cpuacct_cgrp_id'; did you mean 'cpu_cgrp_id'?
     908 |                         cgroup = task_cgroup(task, cpuacct_cgrp_id);
         |                                                    ^~~~~~~~~~~~~~~
         |                                                    cpu_cgrp_id
   include/linux/cgroup_subsys.h:17:1: note: 'cpu_cgrp_id' declared here
      17 | SUBSYS(cpu)
         | ^
   include/linux/cgroup-defs.h:42:20: note: expanded from macro 'SUBSYS'
      42 | #define SUBSYS(_x) _x ## _cgrp_id,
         |                    ^
   <scratch space>:298:1: note: expanded from here
     298 | cpu_cgrp_id
         | ^
   1 error generated.

Kconfig warnings: (for reference only)
   WARNING: unmet direct dependencies detected for DRM_I915_DEBUG_GEM
   Depends on [n]: HAS_IOMEM [=y] && DRM_I915 [=y] && EXPERT [=y] && DRM_I915_WERROR [=n]
   Selected by [y]:
   - DRM_I915_DEBUG [=y] && HAS_IOMEM [=y] && DRM_I915 [=y] && EXPERT [=y] && !COMPILE_TEST [=n]


vim +908 kernel/sched/psi.c

   899	
   900	static inline struct psi_group *task_psi_group(struct task_struct *task)
   901	{
   902	#ifdef CONFIG_CGROUPS
   903		if (static_branch_likely(&psi_cgroups_enabled)) {
   904			if (task_is_in_psi_v1()) {
   905				struct cgroup *cgroup;
   906	
   907				rcu_read_lock();
 > 908				cgroup = task_cgroup(task, cpuacct_cgrp_id);
   909				rcu_read_unlock();
   910				return cgroup_psi(cgroup);
   911			}
   912			return cgroup_psi(task_dfl_cgroup(task));
   913		}
   914	#endif
   915		return &psi_system;
   916	}
   917	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki