summaryrefslogtreecommitdiffstats
path: root/kernel/sched.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2007-08-09 11:16:47 +0200
committerIngo Molnar <mingo@elte.hu>2007-08-09 11:16:47 +0200
commitc1b3da3ecdbf9e9f377474c11ba988b8821f86c8 (patch)
treecb38b24a25ec27eed779e100eb9af909ba487bb7 /kernel/sched.c
parent2ab81159fa426bd09c21faf7c25fba13bc9d2902 (diff)
downloadlinux-stable-c1b3da3ecdbf9e9f377474c11ba988b8821f86c8.tar.gz
linux-stable-c1b3da3ecdbf9e9f377474c11ba988b8821f86c8.tar.bz2
linux-stable-c1b3da3ecdbf9e9f377474c11ba988b8821f86c8.zip
sched: eliminate __rq_clock() use
eliminate __rq_clock() use by changing it to: __update_rq_clock(rq) now = rq->clock; identity transformation - no change in behavior. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r--kernel/sched.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 893211054790..d67345175179 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1967,9 +1967,12 @@ static void update_cpu_load(struct rq *this_rq)
unsigned long total_load = this_rq->ls.load.weight;
unsigned long this_load = total_load;
struct load_stat *ls = &this_rq->ls;
- u64 now = __rq_clock(this_rq);
+ u64 now;
int i, scale;
+ __update_rq_clock(this_rq);
+ now = this_rq->clock;
+
this_rq->nr_load_updates++;
if (unlikely(!(sysctl_sched_features & SCHED_FEAT_PRECISE_CPU_LOAD)))
goto do_avg;
@@ -3458,7 +3461,8 @@ need_resched_nonpreemptible:
spin_lock_irq(&rq->lock);
clear_tsk_need_resched(prev);
- now = __rq_clock(rq);
+ __update_rq_clock(rq);
+ now = rq->clock;
if (prev->state && !(preempt_count() & PREEMPT_ACTIVE)) {
if (unlikely((prev->state & TASK_INTERRUPTIBLE) &&