Commit b7cc0896 authored by Ingo Molnar's avatar Ingo Molnar

sched: remove the 'u64 now' parameter from update_curr()

remove the 'u64 now' parameter from update_curr().

( identity transformation that causes no change in functionality. )
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5cef9eca
...@@ -281,7 +281,7 @@ add_wait_runtime(struct cfs_rq *cfs_rq, struct sched_entity *se, long delta) ...@@ -281,7 +281,7 @@ add_wait_runtime(struct cfs_rq *cfs_rq, struct sched_entity *se, long delta)
* are not in our scheduling class. * are not in our scheduling class.
*/ */
static inline void static inline void
__update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr, u64 now) __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr)
{ {
unsigned long delta, delta_exec, delta_fair, delta_mine; unsigned long delta, delta_exec, delta_fair, delta_mine;
struct load_weight *lw = &cfs_rq->load; struct load_weight *lw = &cfs_rq->load;
...@@ -320,7 +320,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr, u64 now) ...@@ -320,7 +320,7 @@ __update_curr(struct cfs_rq *cfs_rq, struct sched_entity *curr, u64 now)
add_wait_runtime(cfs_rq, curr, delta_mine - delta_exec); add_wait_runtime(cfs_rq, curr, delta_mine - delta_exec);
} }
static void update_curr(struct cfs_rq *cfs_rq, u64 now) static void update_curr(struct cfs_rq *cfs_rq)
{ {
struct sched_entity *curr = cfs_rq_curr(cfs_rq); struct sched_entity *curr = cfs_rq_curr(cfs_rq);
unsigned long delta_exec; unsigned long delta_exec;
...@@ -338,7 +338,7 @@ static void update_curr(struct cfs_rq *cfs_rq, u64 now) ...@@ -338,7 +338,7 @@ static void update_curr(struct cfs_rq *cfs_rq, u64 now)
curr->delta_exec += delta_exec; curr->delta_exec += delta_exec;
if (unlikely(curr->delta_exec > sysctl_sched_stat_granularity)) { if (unlikely(curr->delta_exec > sysctl_sched_stat_granularity)) {
__update_curr(cfs_rq, curr, now); __update_curr(cfs_rq, curr);
curr->delta_exec = 0; curr->delta_exec = 0;
} }
curr->exec_start = rq_of(cfs_rq)->clock; curr->exec_start = rq_of(cfs_rq)->clock;
...@@ -453,7 +453,7 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se, u64 now) ...@@ -453,7 +453,7 @@ update_stats_wait_end(struct cfs_rq *cfs_rq, struct sched_entity *se, u64 now)
static inline void static inline void
update_stats_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se, u64 now) update_stats_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se, u64 now)
{ {
update_curr(cfs_rq, now); update_curr(cfs_rq);
/* /*
* Mark the end of the wait period if dequeueing a * Mark the end of the wait period if dequeueing a
* waiting task: * waiting task:
...@@ -579,7 +579,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, ...@@ -579,7 +579,7 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se,
/* /*
* Update the fair clock. * Update the fair clock.
*/ */
update_curr(cfs_rq, now); update_curr(cfs_rq);
if (wakeup) if (wakeup)
enqueue_sleeper(cfs_rq, se, now); enqueue_sleeper(cfs_rq, se, now);
...@@ -660,7 +660,7 @@ put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev, u64 now) ...@@ -660,7 +660,7 @@ put_prev_entity(struct cfs_rq *cfs_rq, struct sched_entity *prev, u64 now)
* was not called and update_curr() has to be done: * was not called and update_curr() has to be done:
*/ */
if (prev->on_rq) if (prev->on_rq)
update_curr(cfs_rq, now); update_curr(cfs_rq);
update_stats_curr_end(cfs_rq, prev, now); update_stats_curr_end(cfs_rq, prev, now);
...@@ -851,7 +851,7 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p) ...@@ -851,7 +851,7 @@ static void check_preempt_curr_fair(struct rq *rq, struct task_struct *p)
if (unlikely(rt_prio(p->prio))) { if (unlikely(rt_prio(p->prio))) {
update_rq_clock(rq); update_rq_clock(rq);
update_curr(cfs_rq, rq->clock); update_curr(cfs_rq);
resched_task(curr); resched_task(curr);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment