diff options
author | Ingo Molnar <mingo@elte.hu> | 2007-08-09 05:16:51 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2007-08-09 05:16:51 -0400 |
commit | 546fe3c909b0a4235c7237c210da483eaaac1edc (patch) | |
tree | 1b81c3f5f7b56f74a708d65b20a34c856b431e49 /kernel/sched.c | |
parent | a48da48b403319918a587be8b5d46fe1d186c2ac (diff) |
sched: move the __update_rq_clock() call to scheduler_tick()
move the __update_rq_clock() call from update_cpu_load() to
scheduler_tick().
( identity transformation that causes no change in functionality. )
this allows the direct use of rq->clock in ->task_tick() functions.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b78b9d9ffd1c..3f5d52949990 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -1949,8 +1949,6 @@ static void update_cpu_load(struct rq *this_rq) | |||
1949 | struct load_stat *ls = &this_rq->ls; | 1949 | struct load_stat *ls = &this_rq->ls; |
1950 | int i, scale; | 1950 | int i, scale; |
1951 | 1951 | ||
1952 | __update_rq_clock(this_rq); | ||
1953 | |||
1954 | this_rq->nr_load_updates++; | 1952 | this_rq->nr_load_updates++; |
1955 | if (unlikely(!(sysctl_sched_features & SCHED_FEAT_PRECISE_CPU_LOAD))) | 1953 | if (unlikely(!(sysctl_sched_features & SCHED_FEAT_PRECISE_CPU_LOAD))) |
1956 | goto do_avg; | 1954 | goto do_avg; |
@@ -3301,6 +3299,7 @@ void scheduler_tick(void) | |||
3301 | struct task_struct *curr = rq->curr; | 3299 | struct task_struct *curr = rq->curr; |
3302 | 3300 | ||
3303 | spin_lock(&rq->lock); | 3301 | spin_lock(&rq->lock); |
3302 | __update_rq_clock(rq); | ||
3304 | update_cpu_load(rq); | 3303 | update_cpu_load(rq); |
3305 | if (curr != rq->idle) /* FIXME: needed? */ | 3304 | if (curr != rq->idle) /* FIXME: needed? */ |
3306 | curr->sched_class->task_tick(rq, curr); | 3305 | curr->sched_class->task_tick(rq, curr); |