---

yaml --- r: 121339 b: refs/heads/master c: 5436499 h: refs/heads/master i: 121337: 43603ad 121335: 3b90824 v: v3
git-mirror · Dec 8, 2008 · 3faf8ac · 3faf8ac
1 parent 0985818
commit 3faf8ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d117c5c6b00254e51c61ff5b506ccaba21a5a03
+refs/heads/master: 5436499e6098759c2340f8b906ea52f993dc4efb
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -6768,6 +6768,8 @@ sd_parent_degenerate(struct sched_domain *sd, struct sched_domain *parent)
 				SD_BALANCE_EXEC |
 				SD_SHARE_CPUPOWER |
 				SD_SHARE_PKG_RESOURCES);
+		if (nr_node_ids == 1)
+			pflags &= ~SD_SERIALIZE;
 	}
 	if (~cflags & pflags)
 		return 0;