diff options
author | Siddha, Suresh B <suresh.b.siddha@intel.com> | 2006-10-03 04:14:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 11:04:06 -0400 |
commit | 1a84887080dc15f048db7c3a643e98f1435790d6 (patch) | |
tree | 7cd335fee247c0b60f8562c82806b49435b5fb9d /include/linux | |
parent | 74732646431a1bb7e23e6b564127a8881cfef900 (diff) |
[PATCH] sched: introduce child field in sched_domain
Introduce the child field in sched_domain struct and use it in
sched_balance_self().
We will also use this field in cleaning up the sched group cpu_power
setup(done in a different patch) code.
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/sched.h | 1 | ||||
-rw-r--r-- | include/linux/topology.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 38530232d92f..8e26c9069f15 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -644,6 +644,7 @@ struct sched_group { | |||
644 | struct sched_domain { | 644 | struct sched_domain { |
645 | /* These fields must be setup */ | 645 | /* These fields must be setup */ |
646 | struct sched_domain *parent; /* top domain must be null terminated */ | 646 | struct sched_domain *parent; /* top domain must be null terminated */ |
647 | struct sched_domain *child; /* bottom domain must be null terminated */ | ||
647 | struct sched_group *groups; /* the balancing groups of the domain */ | 648 | struct sched_group *groups; /* the balancing groups of the domain */ |
648 | cpumask_t span; /* span of all CPUs in this domain */ | 649 | cpumask_t span; /* span of all CPUs in this domain */ |
649 | unsigned long min_interval; /* Minimum balance interval ms */ | 650 | unsigned long min_interval; /* Minimum balance interval ms */ |
diff --git a/include/linux/topology.h b/include/linux/topology.h index ec1eca85290a..486bec23f986 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h | |||
@@ -89,6 +89,7 @@ | |||
89 | #define SD_SIBLING_INIT (struct sched_domain) { \ | 89 | #define SD_SIBLING_INIT (struct sched_domain) { \ |
90 | .span = CPU_MASK_NONE, \ | 90 | .span = CPU_MASK_NONE, \ |
91 | .parent = NULL, \ | 91 | .parent = NULL, \ |
92 | .child = NULL, \ | ||
92 | .groups = NULL, \ | 93 | .groups = NULL, \ |
93 | .min_interval = 1, \ | 94 | .min_interval = 1, \ |
94 | .max_interval = 2, \ | 95 | .max_interval = 2, \ |
@@ -119,6 +120,7 @@ | |||
119 | #define SD_CPU_INIT (struct sched_domain) { \ | 120 | #define SD_CPU_INIT (struct sched_domain) { \ |
120 | .span = CPU_MASK_NONE, \ | 121 | .span = CPU_MASK_NONE, \ |
121 | .parent = NULL, \ | 122 | .parent = NULL, \ |
123 | .child = NULL, \ | ||
122 | .groups = NULL, \ | 124 | .groups = NULL, \ |
123 | .min_interval = 1, \ | 125 | .min_interval = 1, \ |
124 | .max_interval = 4, \ | 126 | .max_interval = 4, \ |
@@ -146,6 +148,7 @@ | |||
146 | #define SD_ALLNODES_INIT (struct sched_domain) { \ | 148 | #define SD_ALLNODES_INIT (struct sched_domain) { \ |
147 | .span = CPU_MASK_NONE, \ | 149 | .span = CPU_MASK_NONE, \ |
148 | .parent = NULL, \ | 150 | .parent = NULL, \ |
151 | .child = NULL, \ | ||
149 | .groups = NULL, \ | 152 | .groups = NULL, \ |
150 | .min_interval = 64, \ | 153 | .min_interval = 64, \ |
151 | .max_interval = 64*num_online_cpus(), \ | 154 | .max_interval = 64*num_online_cpus(), \ |