From c68ecd95ca034a470ef4ef1b390dbc30ad3cf357 Mon Sep 17 00:00:00 2001 From: Paul Turner Date: Fri, 21 Jan 2011 20:45:02 -0800 Subject: [PATCH] --- yaml --- r: 232501 b: refs/heads/master c: 05ca62c6ca17f39b88fa956d5ebc1fa6e93ad5e3 h: refs/heads/master i: 232499: 144fb32e482fb5809168593880564c0a2e9c1d85 v: v3 --- [refs] | 2 +- trunk/kernel/sched_fair.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9e845b37b203..ea6ecb14130b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b815f1963e47b9b69bb17e0588bd5af5b1114ae0 +refs/heads/master: 05ca62c6ca17f39b88fa956d5ebc1fa6e93ad5e3 diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c index 1997383ba4d6..0c26e2df450e 100644 --- a/trunk/kernel/sched_fair.c +++ b/trunk/kernel/sched_fair.c @@ -725,7 +725,7 @@ static void update_cfs_load(struct cfs_rq *cfs_rq, int global_update) if (cfs_rq->tg == &root_task_group) return; - now = rq_of(cfs_rq)->clock; + now = rq_of(cfs_rq)->clock_task; delta = now - cfs_rq->load_stamp; /* truncate load history at 4 idle periods */