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

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

Merge "sched: window-stats: 64-bit type for curr/prev_runnable_sum"

parents c3f1922e 098d8371

kernel/sched/core.c

+4 −4
Original line number Diff line number Diff line
@@ -1276,7 +1276,7 @@ compute_demand: 


	if (update_sum && (p->ravg.flags & CURR_WINDOW_CONTRIB)) {

		rq->curr_runnable_sum -= p->ravg.partial_demand;

		BUG_ON((int)rq->curr_runnable_sum < 0);

		BUG_ON((s64)rq->curr_runnable_sum < 0);

	}



	p->ravg.partial_demand = demand;
@@ -1485,7 +1485,7 @@ static void update_task_ravg(struct task_struct *p, struct rq *rq, 
			} else  {

				if (!nr_full_windows) {

					rq->prev_runnable_sum -= partial_demand;

					BUG_ON(rq->prev_runnable_sum < 0);

					BUG_ON((s64)rq->prev_runnable_sum < 0);

				}

				rq->prev_runnable_sum += p->ravg.demand;

				rq->curr_runnable_sum += p->ravg.partial_demand;
@@ -1973,8 +1973,8 @@ static void fixup_busy_time(struct task_struct *p, int new_cpu) 
		dest_rq->prev_runnable_sum += p->ravg.demand;

	}



	BUG_ON((int)src_rq->prev_runnable_sum < 0);

	BUG_ON((int)src_rq->curr_runnable_sum < 0);

	BUG_ON((s64)src_rq->prev_runnable_sum < 0);

	BUG_ON((s64)src_rq->curr_runnable_sum < 0);



	trace_sched_migration_update_sum(src_rq);

	trace_sched_migration_update_sum(dest_rq);

kernel/sched/sched.h

+2 −2
Original line number Diff line number Diff line
@@ -498,8 +498,8 @@ struct rq { 
	int max_possible_capacity;

	u64 window_start;



	unsigned int curr_runnable_sum;

	unsigned int prev_runnable_sum;

	u64 curr_runnable_sum;

	u64 prev_runnable_sum;

#endif



#ifdef CONFIG_SCHED_HMP