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

Merge "sched: Fix compilation issue with reset_hmp_stats"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-27 15:48:59 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2a676929f1
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kernel/sched/fair.c
View file

@ -3525,7 +3525,7 @@ static void dec_throttled_cfs_rq_hmp_stats(struct hmp_sched_stats *stats,
BUG_ON(stats->nr_big_tasks < 0 || BUG_ON(stats->nr_big_tasks < 0 ||
(s64)stats->cumulative_runnable_avg < 0); (s64)stats->cumulative_runnable_avg < 0);
verify_pred_demands_sum(stats); BUG_ON((s64)stats->pred_demands_sum < 0);
} }
#else /* CONFIG_CFS_BANDWIDTH */ #else /* CONFIG_CFS_BANDWIDTH */

2
kernel/sched/hmp.c
View file

@ -1387,7 +1387,7 @@ void dec_rq_hmp_stats(struct rq *rq, struct task_struct *p, int change_cra)
dec_cumulative_runnable_avg(&rq->hmp_stats, p); dec_cumulative_runnable_avg(&rq->hmp_stats, p);
} }
static void reset_hmp_stats(struct hmp_sched_stats *stats, int reset_cra) void reset_hmp_stats(struct hmp_sched_stats *stats, int reset_cra)
{ {
stats->nr_big_tasks = 0; stats->nr_big_tasks = 0;
if (reset_cra) { if (reset_cra) {

1
kernel/sched/sched.h
View file

@ -1407,6 +1407,7 @@ extern void inc_rq_hmp_stats(struct rq *rq,
struct task_struct *p, int change_cra); struct task_struct *p, int change_cra);
extern void dec_rq_hmp_stats(struct rq *rq, extern void dec_rq_hmp_stats(struct rq *rq,
struct task_struct *p, int change_cra); struct task_struct *p, int change_cra);
extern void reset_hmp_stats(struct hmp_sched_stats *stats, int reset_cra);
extern int is_big_task(struct task_struct *p); extern int is_big_task(struct task_struct *p);
extern int upmigrate_discouraged(struct task_struct *p); extern int upmigrate_discouraged(struct task_struct *p);
extern struct sched_cluster *rq_cluster(struct rq *rq); extern struct sched_cluster *rq_cluster(struct rq *rq);