From 8c18aeee5bff7b5867dd03bddfa0199fac48de69 Mon Sep 17 00:00:00 2001
From: Dmitry Adamushko <dmitry.adamushko@gmail.com>
Date: Fri, 25 Jan 2008 21:08:21 +0100
Subject: [PATCH] --- yaml --- r: 76159 b: refs/heads/master c:
 9ec3b77e11b9398ab40b492c4fde7d8aac04a718 h: refs/heads/master i:   76157:
 13ee46989a7643cd0da2eeb3c063b2ef01bb048b   76155:
 44ab4be68baa0a2138665f1762b547e93a562223   76151:
 69017cb864d7724131c89ba3213790e22612933e   76143:
 d555d499cd6a9d97f3e8785b0b35ad298d2a0730   76127:
 5c3c2722eb0e690d0fad95313037b5d3dc318f35   76095:
 b90b586e4f5693ae03cd62219e6ec53d5943414c   76031:
 8e743068df89ff7b7f34775455f505ede31300d5 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/sched_fair.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cf5db53ff349..a096ed58440f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32525d022ad52a5c14e80e130260431e16e294b6
+refs/heads/master: 9ec3b77e11b9398ab40b492c4fde7d8aac04a718
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
index f881fc5e035c..2208692dc4a0 100644
--- a/trunk/kernel/sched_fair.c
+++ b/trunk/kernel/sched_fair.c
@@ -925,6 +925,9 @@ static int select_task_rq_fair(struct task_struct *p, int sync)
 	this_cpu = smp_processor_id();
 	new_cpu  = cpu;
 
+	if (cpu == this_cpu)
+		goto out_set_cpu;
+
 	for_each_domain(this_cpu, sd) {
 		if (cpu_isset(cpu, sd->span)) {
 			this_sd = sd;