aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-13 14:03:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-13 14:03:59 -0400
commit3b5c6b834984b09b7b7fba6a97d3a2878a4a8e42 (patch)
treec0b2c2d773441852149ef38428a8214a1ab6b807
parent9df2fe986770bc4c76e8fe72c20b71268eec39a7 (diff)
parent3e84050c81ffb4961ef43d20e1fb1d7607167d83 (diff)
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: cpusets, hotplug, scheduler: fix scheduler domain breakage
-rw-r--r--kernel/cpuset.c24
1 files changed, 18 insertions, 6 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c
index 9fceb97e989c..798b3ab054eb 100644
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
@@ -1882,7 +1882,7 @@ static void scan_for_empty_cpusets(const struct cpuset *root)
1882 * in order to minimize text size. 1882 * in order to minimize text size.
1883 */ 1883 */
1884 1884
1885static void common_cpu_mem_hotplug_unplug(void) 1885static void common_cpu_mem_hotplug_unplug(int rebuild_sd)
1886{ 1886{
1887 cgroup_lock(); 1887 cgroup_lock();
1888 1888
@@ -1894,7 +1894,8 @@ static void common_cpu_mem_hotplug_unplug(void)
1894 * Scheduler destroys domains on hotplug events. 1894 * Scheduler destroys domains on hotplug events.
1895 * Rebuild them based on the current settings. 1895 * Rebuild them based on the current settings.
1896 */ 1896 */
1897 rebuild_sched_domains(); 1897 if (rebuild_sd)
1898 rebuild_sched_domains();
1898 1899
1899 cgroup_unlock(); 1900 cgroup_unlock();
1900} 1901}
@@ -1912,11 +1913,22 @@ static void common_cpu_mem_hotplug_unplug(void)
1912static int cpuset_handle_cpuhp(struct notifier_block *unused_nb, 1913static int cpuset_handle_cpuhp(struct notifier_block *unused_nb,
1913 unsigned long phase, void *unused_cpu) 1914 unsigned long phase, void *unused_cpu)
1914{ 1915{
1915 if (phase == CPU_DYING || phase == CPU_DYING_FROZEN) 1916 switch (phase) {
1917 case CPU_UP_CANCELED:
1918 case CPU_UP_CANCELED_FROZEN:
1919 case CPU_DOWN_FAILED:
1920 case CPU_DOWN_FAILED_FROZEN:
1921 case CPU_ONLINE:
1922 case CPU_ONLINE_FROZEN:
1923 case CPU_DEAD:
1924 case CPU_DEAD_FROZEN:
1925 common_cpu_mem_hotplug_unplug(1);
1926 break;
1927 default:
1916 return NOTIFY_DONE; 1928 return NOTIFY_DONE;
1929 }
1917 1930
1918 common_cpu_mem_hotplug_unplug(); 1931 return NOTIFY_OK;
1919 return 0;
1920} 1932}
1921 1933
1922#ifdef CONFIG_MEMORY_HOTPLUG 1934#ifdef CONFIG_MEMORY_HOTPLUG
@@ -1929,7 +1941,7 @@ static int cpuset_handle_cpuhp(struct notifier_block *unused_nb,
1929 1941
1930void cpuset_track_online_nodes(void) 1942void cpuset_track_online_nodes(void)
1931{ 1943{
1932 common_cpu_mem_hotplug_unplug(); 1944 common_cpu_mem_hotplug_unplug(0);
1933} 1945}
1934#endif 1946#endif
1935 1947