diff options
| author | John Hawkes <hawkes@sgi.com> | 2005-09-06 18:18:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:41 -0400 |
| commit | 0811bab24ff1eecab38110eda7ea7847db95c64e (patch) | |
| tree | 1de9a8a04c8c3dec7f9cdf46f2db6b6609757127 /kernel | |
| parent | d1b551386a5f3f50a5003b691f819b07f8e6f034 (diff) | |
[PATCH] cpusets: re-enable "dynamic sched domains"
Revert the hack introduced last week.
Signed-off-by: John Hawkes <hawkes@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/cpuset.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 40c6d801dd66..1f06e7690106 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
| @@ -628,13 +628,6 @@ static int validate_change(const struct cpuset *cur, const struct cpuset *trial) | |||
| 628 | * lock_cpu_hotplug()/unlock_cpu_hotplug() pair. | 628 | * lock_cpu_hotplug()/unlock_cpu_hotplug() pair. |
| 629 | */ | 629 | */ |
| 630 | 630 | ||
| 631 | /* | ||
| 632 | * Hack to avoid 2.6.13 partial node dynamic sched domain bug. | ||
| 633 | * Disable letting 'cpu_exclusive' cpusets define dynamic sched | ||
| 634 | * domains, until the sched domain can handle partial nodes. | ||
| 635 | * Remove this #if hackery when sched domains fixed. | ||
| 636 | */ | ||
| 637 | #if 0 | ||
| 638 | static void update_cpu_domains(struct cpuset *cur) | 631 | static void update_cpu_domains(struct cpuset *cur) |
| 639 | { | 632 | { |
| 640 | struct cpuset *c, *par = cur->parent; | 633 | struct cpuset *c, *par = cur->parent; |
| @@ -675,11 +668,6 @@ static void update_cpu_domains(struct cpuset *cur) | |||
| 675 | partition_sched_domains(&pspan, &cspan); | 668 | partition_sched_domains(&pspan, &cspan); |
| 676 | unlock_cpu_hotplug(); | 669 | unlock_cpu_hotplug(); |
| 677 | } | 670 | } |
| 678 | #else | ||
| 679 | static void update_cpu_domains(struct cpuset *cur) | ||
| 680 | { | ||
| 681 | } | ||
| 682 | #endif | ||
| 683 | 671 | ||
| 684 | static int update_cpumask(struct cpuset *cs, char *buf) | 672 | static int update_cpumask(struct cpuset *cs, char *buf) |
| 685 | { | 673 | { |
