From 435d7069244d6cebb29de05f79ae1f246a2752d5 Mon Sep 17 00:00:00 2001 From: Yihao Wu Date: Thu, 30 Apr 2020 15:46:23 +0800 Subject: [PATCH 0998/2944] alinux: sched: Fix nr_migrations compile errors to #27363370 When CONFIG_SCHED_SLI is not set, compiler gives errors about task_ca_increase_nr_migrations redefinition. It should've been an empty implementation in this case. Fixes: 965d75d3785c ("alinux: cpuacct: make cpuacct record nr_migrations") Signed-off-by: Yihao Wu Acked-by: Caspar Zhang --- kernel/sched/cpuacct.c | 2 ++ kernel/sched/sched.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/sched/cpuacct.c b/kernel/sched/cpuacct.c index eaacf6e..d99f610 100644 --- a/kernel/sched/cpuacct.c +++ b/kernel/sched/cpuacct.c @@ -77,6 +77,7 @@ static inline struct cpuacct *parent_ca(struct cpuacct *ca) #endif }; +#ifdef CONFIG_SCHED_SLI void task_ca_increase_nr_migrations(struct task_struct *tsk) { struct cpuacct *ca; @@ -86,6 +87,7 @@ void task_ca_increase_nr_migrations(struct task_struct *tsk) this_cpu_ptr(ca->alistats)->nr_migrations++; rcu_read_unlock(); } +#endif /* Create a new CPU accounting group */ static struct cgroup_subsys_state * diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h index f1d1f31..dd7a54b 100644 --- a/kernel/sched/sched.h +++ b/kernel/sched/sched.h @@ -2287,7 +2287,7 @@ unsigned long scale_irq_capacity(unsigned long util, unsigned long irq, unsigned #ifdef CONFIG_SCHED_SLI extern u64 get_idle_time(int cpu); extern u64 get_iowait_time(int cpu); -void task_ca_increase_nr_migrations(struct task_struct *tsk); +extern void task_ca_increase_nr_migrations(struct task_struct *tsk); #else static inline void task_ca_increase_nr_migrations(struct task_struct *tsk) { } #endif -- 1.8.3.1