hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IAA9B8 -------------------------------- Fix two compile problems for psi_grained: 1) When CONFIG_PSI_FINE_GRAINED=n 2) When CONFIG_QOS_SCHED=n Fixes: 4a69b56540f4 ("sched/psi: Introduce pressure.stat in psi") Fixes: 654944510822 ("sched/psi: add cpu fine grained stall tracking in pressure.stat") Signed-off-by: Lu Jialin <lujialin4@huawei.com> --- kernel/cgroup/cgroup.c | 4 +++- kernel/sched/psi.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index b88950623814..8275ae1a3a95 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c @@ -4017,14 +4017,16 @@ struct cftype cgroup_v1_psi_files[] = { .release = cgroup_pressure_release, }, #endif +#ifdef CONFIG_PSI_FINE_GRAINED { .name = "pressure.stat", .flags = CFTYPE_NO_PREFIX, .seq_show = cgroup_psi_stat_show, }, +#endif /*CONFIG_PSI_FINE_GRAINED*/ { } /* terminate */ }; -#endif +#endif /*CONFIG_PSI_CGROUP_V1*/ #else /* CONFIG_PSI */ bool cgroup_psi_enabled(void) { diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 1c8b1f997513..32ebbc50f2ed 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c @@ -376,8 +376,8 @@ static void record_stat_times(struct psi_group_cpu *groupc, u32 delta) #ifdef CONFIG_QOS_SCHED else if (groupc->prev_throttle == QOS_THROTTLED) groupc->fine_grained_times[PSI_CPU_QOS_FULL] += delta; - } #endif + } #endif } -- 2.34.1