summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 00:47:21 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 00:47:21 +0200
commite1d7bf14999469b16e86889ac71c94a9d0d2f5f4 (patch)
tree32d56c2faac08ac02730a46498183e7222744705 /include
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentMerge branch 'sched/cpuset' into sched/urgent (diff)
downloadlinux-e1d7bf14999469b16e86889ac71c94a9d0d2f5f4.tar.xz
linux-e1d7bf14999469b16e86889ac71c94a9d0d2f5f4.zip
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: arch_reinit_sched_domains() must destroy domains to force rebuild sched, cpuset: rework sched domains and CPU hotplug handling (v4)
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpuset.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
index e8f450c499b0..2691926fb506 100644
--- 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 */