---

yaml --- r: 276798 b: refs/heads/master c: ab27892 h: refs/heads/master v: v3
git-mirror · Dec 16, 2011 · 187ca62 · 187ca62
1 parent e0cd9af
commit 187ca62
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75fc2d3797c47f5f70ca71c41c342c352845cd06
+refs/heads/master: ab2789213d224202237292d78aaa0c386c7b28b2
diff --git a/trunk/kernel/sched_fair.c b/trunk/kernel/sched_fair.c
@@ -2352,13 +2352,11 @@ static int select_idle_sibling(struct task_struct *p, int target)
 		if (!smt && (sd->flags & SD_SHARE_CPUPOWER))
 			continue;
 
-		if (!(sd->flags & SD_SHARE_PKG_RESOURCES)) {
-			if (!smt) {
-				smt = 1;
-				goto again;
-			}
+		if (smt && !(sd->flags & SD_SHARE_CPUPOWER))
+			break;
+
+		if (!(sd->flags & SD_SHARE_PKG_RESOURCES))
 			break;
-		}
 
 		sg = sd->groups;
 		do {
@@ -2378,6 +2376,10 @@ static int select_idle_sibling(struct task_struct *p, int target)
 			sg = sg->next;
 		} while (sg != sd->groups);
 	}
+	if (!smt) {
+		smt = 1;
+		goto again;
+	}
 done:
 	rcu_read_unlock();