diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-i386/topology.h | 1 | ||||
| -rw-r--r-- | include/asm-ia64/topology.h | 2 | ||||
| -rw-r--r-- | include/asm-mips/mach-ip27/topology.h | 1 | ||||
| -rw-r--r-- | include/asm-powerpc/topology.h | 1 | ||||
| -rw-r--r-- | include/asm-x86_64/topology.h | 1 | ||||
| -rw-r--r-- | include/linux/sched.h | 1 | ||||
| -rw-r--r-- | include/linux/topology.h | 3 |
7 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-i386/topology.h b/include/asm-i386/topology.h index 6adbd9b1ae88..978d09596130 100644 --- a/include/asm-i386/topology.h +++ b/include/asm-i386/topology.h | |||
| @@ -74,6 +74,7 @@ static inline int node_to_first_cpu(int node) | |||
| 74 | #define SD_NODE_INIT (struct sched_domain) { \ | 74 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 75 | .span = CPU_MASK_NONE, \ | 75 | .span = CPU_MASK_NONE, \ |
| 76 | .parent = NULL, \ | 76 | .parent = NULL, \ |
| 77 | .child = NULL, \ | ||
| 77 | .groups = NULL, \ | 78 | .groups = NULL, \ |
| 78 | .min_interval = 8, \ | 79 | .min_interval = 8, \ |
| 79 | .max_interval = 32, \ | 80 | .max_interval = 32, \ |
diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h index 937c21257523..a6e38565ab4c 100644 --- a/include/asm-ia64/topology.h +++ b/include/asm-ia64/topology.h | |||
| @@ -59,6 +59,7 @@ void build_cpu_to_node_map(void); | |||
| 59 | #define SD_CPU_INIT (struct sched_domain) { \ | 59 | #define SD_CPU_INIT (struct sched_domain) { \ |
| 60 | .span = CPU_MASK_NONE, \ | 60 | .span = CPU_MASK_NONE, \ |
| 61 | .parent = NULL, \ | 61 | .parent = NULL, \ |
| 62 | .child = NULL, \ | ||
| 62 | .groups = NULL, \ | 63 | .groups = NULL, \ |
| 63 | .min_interval = 1, \ | 64 | .min_interval = 1, \ |
| 64 | .max_interval = 4, \ | 65 | .max_interval = 4, \ |
| @@ -84,6 +85,7 @@ void build_cpu_to_node_map(void); | |||
| 84 | #define SD_NODE_INIT (struct sched_domain) { \ | 85 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 85 | .span = CPU_MASK_NONE, \ | 86 | .span = CPU_MASK_NONE, \ |
| 86 | .parent = NULL, \ | 87 | .parent = NULL, \ |
| 88 | .child = NULL, \ | ||
| 87 | .groups = NULL, \ | 89 | .groups = NULL, \ |
| 88 | .min_interval = 8, \ | 90 | .min_interval = 8, \ |
| 89 | .max_interval = 8*(min(num_online_cpus(), 32)), \ | 91 | .max_interval = 8*(min(num_online_cpus(), 32)), \ |
diff --git a/include/asm-mips/mach-ip27/topology.h b/include/asm-mips/mach-ip27/topology.h index 59d26b52ba32..a13b715fd9ca 100644 --- a/include/asm-mips/mach-ip27/topology.h +++ b/include/asm-mips/mach-ip27/topology.h | |||
| @@ -22,6 +22,7 @@ extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES]; | |||
| 22 | #define SD_NODE_INIT (struct sched_domain) { \ | 22 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 23 | .span = CPU_MASK_NONE, \ | 23 | .span = CPU_MASK_NONE, \ |
| 24 | .parent = NULL, \ | 24 | .parent = NULL, \ |
| 25 | .child = NULL, \ | ||
| 25 | .groups = NULL, \ | 26 | .groups = NULL, \ |
| 26 | .min_interval = 8, \ | 27 | .min_interval = 8, \ |
| 27 | .max_interval = 32, \ | 28 | .max_interval = 32, \ |
diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h index bbc3844b086f..8f7ee16781a4 100644 --- a/include/asm-powerpc/topology.h +++ b/include/asm-powerpc/topology.h | |||
| @@ -43,6 +43,7 @@ extern int pcibus_to_node(struct pci_bus *bus); | |||
| 43 | #define SD_NODE_INIT (struct sched_domain) { \ | 43 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 44 | .span = CPU_MASK_NONE, \ | 44 | .span = CPU_MASK_NONE, \ |
| 45 | .parent = NULL, \ | 45 | .parent = NULL, \ |
| 46 | .child = NULL, \ | ||
| 46 | .groups = NULL, \ | 47 | .groups = NULL, \ |
| 47 | .min_interval = 8, \ | 48 | .min_interval = 8, \ |
| 48 | .max_interval = 32, \ | 49 | .max_interval = 32, \ |
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86_64/topology.h index 6e7a2e976b04..5c8f49280dbc 100644 --- a/include/asm-x86_64/topology.h +++ b/include/asm-x86_64/topology.h | |||
| @@ -31,6 +31,7 @@ extern int __node_distance(int, int); | |||
| 31 | #define SD_NODE_INIT (struct sched_domain) { \ | 31 | #define SD_NODE_INIT (struct sched_domain) { \ |
| 32 | .span = CPU_MASK_NONE, \ | 32 | .span = CPU_MASK_NONE, \ |
| 33 | .parent = NULL, \ | 33 | .parent = NULL, \ |
| 34 | .child = NULL, \ | ||
| 34 | .groups = NULL, \ | 35 | .groups = NULL, \ |
| 35 | .min_interval = 8, \ | 36 | .min_interval = 8, \ |
| 36 | .max_interval = 32, \ | 37 | .max_interval = 32, \ |
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(), \ |