evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sched: remove init_new_task_load from CONFIG_SMP

Browse source 
Move init_new_task_load function from CONFIG_SMP to avoid
linking error for ARCH=um

Signed-off-by: Jeevan Shriram <jshriram@codeaurora.org>
This commit is contained in:
Jeevan Shriram 2016-03-15 12:16:55 -07:00 • committed by David Keitel
parent 643a137249
commit 48d195bfd6
1 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
kernel/sched/fair.c
View file

@ -3976,38 +3976,6 @@ dec_hmp_sched_stats_fair(struct rq *rq, struct task_struct *p) { }
#endif /* CONFIG_SCHED_HMP */
#ifdef CONFIG_SCHED_HMP
void init_new_task_load(struct task_struct *p)
{
int i;
u32 init_load_windows = sched_init_task_load_windows;
u32 init_load_pelt = sched_init_task_load_pelt;
u32 init_load_pct = current->init_load_pct;
p->init_load_pct = 0;
memset(&p->ravg, 0, sizeof(struct ravg));
if (init_load_pct) {
init_load_pelt = div64_u64((u64)init_load_pct *
(u64)LOAD_AVG_MAX, 100);
init_load_windows = div64_u64((u64)init_load_pct *
(u64)sched_ravg_window, 100);
}
p->ravg.demand = init_load_windows;
for (i = 0; i < RAVG_HIST_SIZE_MAX; ++i)
p->ravg.sum_history[i] = init_load_windows;
p->se.avg.runnable_avg_sum_scaled = init_load_pelt;
}
#else /* CONFIG_SCHED_HMP */
void init_new_task_load(struct task_struct *p)
{
}
#endif /* CONFIG_SCHED_HMP */
#if (SCHED_LOAD_SHIFT - SCHED_LOAD_RESOLUTION) != 10 || SCHED_CAPACITY_SHIFT != 10
@ -4395,6 +4363,39 @@ dec_rq_hmp_stats(struct rq *rq, struct task_struct *p, int change_cra) { }
#ifdef CONFIG_SCHED_HMP
void init_new_task_load(struct task_struct *p)
{
int i;
u32 init_load_windows = sched_init_task_load_windows;
u32 init_load_pelt = sched_init_task_load_pelt;
u32 init_load_pct = current->init_load_pct;
p->init_load_pct = 0;
memset(&p->ravg, 0, sizeof(struct ravg));
if (init_load_pct) {
init_load_pelt = div64_u64((u64)init_load_pct *
(u64)LOAD_AVG_MAX, 100);
init_load_windows = div64_u64((u64)init_load_pct *
(u64)sched_ravg_window, 100);
}
p->ravg.demand = init_load_windows;
for (i = 0; i < RAVG_HIST_SIZE_MAX; ++i)
p->ravg.sum_history[i] = init_load_windows;
p->se.avg.runnable_avg_sum_scaled = init_load_pelt;
}
#else /* CONFIG_SCHED_HMP */
void init_new_task_load(struct task_struct *p)
{
}
#endif /* CONFIG_SCHED_HMP */
#ifdef CONFIG_SCHED_HMP
/* Return task demand in percentage scale */
unsigned int pct_task_load(struct task_struct *p)
{