From ca33bbf02d8f5c06c307bfc35cc4dc7e2094b137 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Fri, 27 Nov 2009 14:12:25 +0100 Subject: [PATCH] --- yaml --- r: 175581 b: refs/heads/master c: 5afcdab706d6002cb02b567ba46e650215e694e8 h: refs/heads/master i: 175579: 2c60fb9a8b47027e6cd05a00935f186932c50aa2 v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index d2d6fda619f2..e3ce5c6c2053 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 970b13bacba14a8cef6f642861947df1d175b0b3 +refs/heads/master: 5afcdab706d6002cb02b567ba46e650215e694e8 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 01fd131b47a4..1f9c6d99f15d 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -2060,23 +2060,12 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd) void set_task_cpu(struct task_struct *p, unsigned int new_cpu) { int old_cpu = task_cpu(p); - struct rq *old_rq = cpu_rq(old_cpu), *new_rq = cpu_rq(new_cpu); + struct rq *old_rq = cpu_rq(old_cpu); struct cfs_rq *old_cfsrq = task_cfs_rq(p), *new_cfsrq = cpu_cfs_rq(old_cfsrq, new_cpu); - u64 clock_offset; - - clock_offset = old_rq->clock - new_rq->clock; trace_sched_migrate_task(p, new_cpu); -#ifdef CONFIG_SCHEDSTATS - if (p->se.wait_start) - p->se.wait_start -= clock_offset; - if (p->se.sleep_start) - p->se.sleep_start -= clock_offset; - if (p->se.block_start) - p->se.block_start -= clock_offset; -#endif if (old_cpu != new_cpu) { p->se.nr_migrations++; #ifdef CONFIG_SCHEDSTATS