Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb2a311c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes I3876c1cb,I12a0b93a,I211a255a into msm-4.14 

* changes:
  sched: Fix compilation error with task_in_cum_window_demand for !SCHED_WALT
  sched/fair: move task_fits_max out of SCHED_WALT
  sched: fix compilation error in task_fits_capacity for !SCHED_WALT
parents af3e9ce3 0bb1b96b

kernel/sched/fair.c

+5 −1
Original line number Diff line number Diff line
@@ -40,9 +40,12 @@ 
#include "tune.h"

#include "walt.h"



#ifdef CONFIG_SMP

static inline bool task_fits_max(struct task_struct *p, int cpu);

#endif /* CONFIG_SMP */



#ifdef CONFIG_SCHED_WALT



static inline bool task_fits_max(struct task_struct *p, int cpu);

static void walt_fixup_sched_stats_fair(struct rq *rq, struct task_struct *p,

					u32 new_task_load, u32 new_pred_demand);

static void walt_fixup_nr_big_tasks(struct rq *rq, struct task_struct *p,
@@ -6966,6 +6969,7 @@ static inline int task_fits_capacity(struct task_struct *p, 
					int cpu)

{

	unsigned int margin;

	unsigned long max_capacity = cpu_rq(cpu)->rd->max_cpu_capacity;



	if (capacity == max_capacity)

		return true;

kernel/sched/sched.h

+6 −0
Original line number Diff line number Diff line
@@ -2922,6 +2922,12 @@ static inline int sched_boost(void) 
	return 0;

}



static inline bool

task_in_cum_window_demand(struct rq *rq, struct task_struct *p)

{

	return false;

}



static inline bool hmp_capable(void) { return false; }

static inline bool is_max_capacity_cpu(int cpu) { return true; }

static inline bool is_min_capacity_cpu(int cpu) { return true; }