From 8f7b11d9c90862fd7ac89987a8be689a0e2aace4 Mon Sep 17 00:00:00 2001
From: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date: Wed, 16 Dec 2009 18:04:42 +0100
Subject: [PATCH] --- yaml --- r: 178036 b: refs/heads/master c:
 738d2be4301007f054541c5c4bf7fb6a361c9b3a h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/kernel/sched.c | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 3756ee4ddfa5..43c03df49dc8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88ec22d3edb72b261f8628226cd543589a6d5e1b
+refs/heads/master: 738d2be4301007f054541c5c4bf7fb6a361c9b3a
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
index f92ce63edfff..8a2bfd37ab4f 100644
--- a/trunk/kernel/sched.c
+++ b/trunk/kernel/sched.c
@@ -2034,11 +2034,8 @@ task_hot(struct task_struct *p, u64 now, struct sched_domain *sd)
 	return delta < (s64)sysctl_sched_migration_cost;
 }
 
-
 void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 {
-	int old_cpu = task_cpu(p);
-
 #ifdef CONFIG_SCHED_DEBUG
 	/*
 	 * We should never call set_task_cpu() on a blocked task,
@@ -2049,11 +2046,11 @@ void set_task_cpu(struct task_struct *p, unsigned int new_cpu)
 
 	trace_sched_migrate_task(p, new_cpu);
 
-	if (old_cpu != new_cpu) {
-		p->se.nr_migrations++;
-		perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS,
-				     1, 1, NULL, 0);
-	}
+	if (task_cpu(p) == new_cpu)
+		return;
+
+	p->se.nr_migrations++;
+	perf_sw_event(PERF_COUNT_SW_CPU_MIGRATIONS, 1, 1, NULL, 0);
 
 	__set_task_cpu(p, new_cpu);
 }