Merge branch 'sched/cpuset' into sched/urgent

git-mirror · Sep 6, 2008 · 291c54f · 291c54f
2 parents 4904862 + dfb512e
commit 291c54f
Show file tree

Hide file tree

Showing 3 changed files with 196 additions and 137 deletions.
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
@@ -160,7 +160,7 @@ static inline int current_cpuset_is_being_rebound(void)
 
 static inline void rebuild_sched_domains(void)
 {
-	partition_sched_domains(0, NULL, NULL);
+	partition_sched_domains(1, NULL, NULL);
 }
 
 #endif /* !CONFIG_CPUSETS */