diff --git a/[refs] b/[refs] index 22cf79764240..cc8cd8ab8688 100644 --- 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 index 152828239ef0..74498c840f93 100644 --- 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;