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

Commit 2d51c1e9 authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "ANDROID: sched/walt: Fix compilation issue for x86_64" 



This reverts commit a56900fa.

The compilation issue mentioned in commit 'a56900fa ("ANDROID:
sched/walt: Fix compilation issue for x86_64")' is not needed, as
cumulative_runnable_avg is tracked seperately in walt_sched_stats
structure. And the cumulative_runnable_avg value is updated in
walt_sched_stats tracking functions itself, so reverting the above
commit.

Change-Id: I3003c93d64a95606310af400f210d8633c1012d2
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 8b94b87f

kernel/sched/sched.h

+4 −3
Original line number Diff line number Diff line
@@ -447,6 +447,10 @@ struct cfs_rq { 
	struct list_head leaf_cfs_rq_list;

	struct task_group *tg;	/* group that "owns" this runqueue */



#ifdef CONFIG_SCHED_WALT

	u64 cumulative_runnable_avg;

#endif



#ifdef CONFIG_CFS_BANDWIDTH

	int runtime_enabled;

	u64 runtime_expires;
@@ -456,9 +460,6 @@ struct cfs_rq { 
	u64 throttled_clock_task_time;

	int throttled, throttle_count;

	struct list_head throttled_list;

#ifdef CONFIG_SCHED_WALT

	u64 cumulative_runnable_avg;

#endif /* CONFIG_SCHED_WALT */

#endif /* CONFIG_CFS_BANDWIDTH */

#endif /* CONFIG_FAIR_GROUP_SCHED */

};

kernel/sched/walt.c

+0 −2
Original line number Diff line number Diff line
@@ -148,7 +148,6 @@ static int __init walt_init_ops(void) 
}

late_initcall(walt_init_ops);



#ifdef CONFIG_CFS_BANDWIDTH

void walt_inc_cfs_cumulative_runnable_avg(struct cfs_rq *cfs_rq,

		struct task_struct *p)

{
@@ -160,7 +159,6 @@ void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *cfs_rq, 
{

	cfs_rq->cumulative_runnable_avg -= p->ravg.demand;

}

#endif



static int exiting_task(struct task_struct *p)

{

kernel/sched/walt.h

+8 −13
Original line number Diff line number Diff line
@@ -20,7 +20,10 @@ void walt_update_task_ravg(struct task_struct *p, struct rq *rq, int event, 
		u64 wallclock, u64 irqtime);

void walt_inc_cumulative_runnable_avg(struct rq *rq, struct task_struct *p);

void walt_dec_cumulative_runnable_avg(struct rq *rq, struct task_struct *p);



void walt_inc_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p);

void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p);

void walt_fixup_busy_time(struct task_struct *p, int new_cpu);

void walt_init_new_task_load(struct task_struct *p);

void walt_mark_task_starting(struct task_struct *p);
@@ -40,6 +43,10 @@ static inline void walt_update_task_ravg(struct task_struct *p, struct rq *rq, 
		int event, u64 wallclock, u64 irqtime) { }

static inline void walt_inc_cumulative_runnable_avg(struct rq *rq, struct task_struct *p) { }

static inline void walt_dec_cumulative_runnable_avg(struct rq *rq, struct task_struct *p) { }

static inline void walt_inc_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p) { }

static inline void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p) { }

static inline void walt_fixup_busy_time(struct task_struct *p, int new_cpu) { }

static inline void walt_init_new_task_load(struct task_struct *p) { }

static inline void walt_mark_task_starting(struct task_struct *p) { }
@@ -52,18 +59,6 @@ static inline u64 walt_ktime_clock(void) { return 0; } 


#endif /* CONFIG_SCHED_WALT */



#if defined(CONFIG_CFS_BANDWIDTH) && defined(CONFIG_SCHED_WALT)

void walt_inc_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p);

void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p);

#else

static inline void walt_inc_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p) { }

static inline void walt_dec_cfs_cumulative_runnable_avg(struct cfs_rq *rq,

		struct task_struct *p) { }

#endif



extern bool walt_disabled;



#endif