Unverified Commit 87684ac5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!1581 psi: fix compile error for psi cgroupv1 when CONFIG_CGROUP=n 

Merge Pull Request from: @ci-robot 
 
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/1581

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents d76d084d 61413516

kernel/sched/cpuacct.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

kernel/sched/sched.h

+0 −4
Original line number Diff line number Diff line
@@ -2977,10 +2977,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)))