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

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

Merge changes I3f61cf06,I57a9543f,Iccc2c2ef,I77c6a8fd,I38d006c9,Ie8f5365d into msm-4.14 

* changes:
  sched: Fix compilation issues with schedutil for !SCHED_WALT
  sched/tune: Fix compilation issue when WALT is disabled
  sched: Fix a compilation issue when WALT is disabled
  sched: Fix a compilation issue in find_best_target() for !SCHED_WALT
  sched: Move sched_boost defines out of SCHED_WALT
  sched: Define a stub function for sched_irqload when WALT is disabled
parents 60431318 79161695

kernel/sched/fair.c

+7 −0
Original line number Diff line number Diff line
@@ -7499,6 +7499,7 @@ static inline int wake_to_idle(struct task_struct *p) 
		 (p->flags & PF_WAKE_UP_IDLE);

}



#ifdef CONFIG_SCHED_WALT

static inline struct cpumask *find_rtg_target(struct task_struct *p)

{

	struct related_thread_group *grp;
@@ -7519,6 +7520,12 @@ static inline struct cpumask *find_rtg_target(struct task_struct *p) 


	return rtg_target;

}

#else

static inline struct cpumask *find_rtg_target(struct task_struct *p)

{

	return NULL;

}

#endif



/*

 * Needs to be called inside rcu_read_lock critical section.

kernel/sched/sched.h

+13 −5
Original line number Diff line number Diff line
@@ -2019,6 +2019,9 @@ cpu_util_freq(int cpu, struct sched_walt_cpu_load *walt_load) 
	return cpu_util_freq_pelt(cpu);

}



#define sched_ravg_window TICK_NSEC

#define sysctl_sched_use_walt_cpu_util 0



#endif /* CONFIG_SCHED_WALT */



extern unsigned long
@@ -2497,6 +2500,11 @@ enum sched_boost_policy { 
	SCHED_BOOST_ON_ALL,

};



#define NO_BOOST 0

#define FULL_THROTTLE_BOOST 1

#define CONSERVATIVE_BOOST 2

#define RESTRAINED_BOOST 3



/*

 * Returns the rq capacity of any rq in a group. This does not play

 * well with groups where rq capacity can change independently.
@@ -2573,11 +2581,6 @@ extern void set_preferred_cluster(struct related_thread_group *grp); 
extern void add_new_task_to_grp(struct task_struct *new);

extern unsigned int update_freq_aggregate_threshold(unsigned int threshold);



#define NO_BOOST 0

#define FULL_THROTTLE_BOOST 1

#define CONSERVATIVE_BOOST 2

#define RESTRAINED_BOOST 3



static inline int cpu_capacity(int cpu)

{

	return cpu_rq(cpu)->cluster->capacity;
@@ -2997,6 +3000,11 @@ static inline unsigned long thermal_cap(int cpu) 


static inline void clear_walt_request(int cpu) { }



static inline int is_reserved(int cpu)

{

	return 0;

}



static inline int got_boost_kick(void)

{

	return 0;

kernel/sched/tune.c

+4 −0
Original line number Diff line number Diff line
@@ -574,6 +574,10 @@ static void schedtune_attach(struct cgroup_taskset *tset) 
	cgroup_taskset_for_each(task, css, tset)

		sync_cgroup_colocation(task, colocate);



}

#else

static void schedtune_attach(struct cgroup_taskset *tset)

{

}

#endif

kernel/sched/walt.h

+4 −0
Original line number Diff line number Diff line
@@ -378,6 +378,10 @@ fixup_walt_sched_stats_common(struct rq *rq, struct task_struct *p, 
{

}



static inline u64 sched_irqload(int cpu)

{

	return 0;

}

#endif /* CONFIG_SCHED_WALT */



#endif