未验证 提交 d07cfee1 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!1602 [sync] PR-1581: psi: fix compile error for psi cgroupv1 when CONFIG_CGROUP=n

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/1581 
 
PR sync from: Lu Jialin <lujialin4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PC6T7HRTE7LIGXV2HL57QYEPFKPNYTCX/ 
 
https://gitee.com/openeuler/kernel/issues/I7OOZR 
 
Link:https://gitee.com/openeuler/kernel/pulls/1602 

Reviewed-by: Jialin Zhang <zhangjialin11@huawei.com> 
Signed-off-by: Jialin Zhang <zhangjialin11@huawei.com> 
......@@ -390,6 +390,7 @@ static int __init setup_psi_v1(char *str)
}
__setup("psi_v1=", setup_psi_v1);
extern struct cftype cgroup_v1_psi_files[];
static int __init cgroup_v1_psi_init(void)
{
if (!psi_v1_enable)
......
......@@ -2950,10 +2950,6 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned
}
#endif
#ifdef CONFIG_PSI
extern struct cftype cgroup_v1_psi_files[];
#endif
#if defined(CONFIG_ENERGY_MODEL) && defined(CONFIG_CPU_FREQ_GOV_SCHEDUTIL)
#define perf_domain_span(pd) (to_cpumask(((pd)->em_pd->cpus)))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册