git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
domain.c
diff --git
a/arch/ia64/kernel/domain.c
b/arch/ia64/kernel/domain.c
index
c655353
..
fe532c9
100644
(file)
--- a/
arch/ia64/kernel/domain.c
+++ b/
arch/ia64/kernel/domain.c
@@
-12,6
+12,7
@@
#include <linux/cpumask.h>
#include <linux/init.h>
#include <linux/topology.h>
#include <linux/cpumask.h>
#include <linux/init.h>
#include <linux/topology.h>
+#include <linux/nodemask.h>
#define SD_NODES_PER_DOMAIN 6
#define SD_NODES_PER_DOMAIN 6
@@
-150,10
+151,9
@@
void __devinit arch_init_sched_domains(void)
* Set up domains. Isolated domains just stay on the dummy domain.
*/
for_each_cpu_mask(i, cpu_default_map) {
* Set up domains. Isolated domains just stay on the dummy domain.
*/
for_each_cpu_mask(i, cpu_default_map) {
- int node = cpu_to_node(i);
int group;
struct sched_domain *sd = NULL, *p;
int group;
struct sched_domain *sd = NULL, *p;
- cpumask_t nodemask = node_to_cpumask(
node
);
+ cpumask_t nodemask = node_to_cpumask(
cpu_to_node(i)
);
cpus_and(nodemask, nodemask, cpu_default_map);
cpus_and(nodemask, nodemask, cpu_default_map);
@@
-171,7
+171,7
@@
void __devinit arch_init_sched_domains(void)
sd = &per_cpu(node_domains, i);
*sd = SD_NODE_INIT;
sd = &per_cpu(node_domains, i);
*sd = SD_NODE_INIT;
- sd->span = sched_domain_node_span(
node
);
+ sd->span = sched_domain_node_span(
cpu_to_node(i)
);
sd->parent = p;
cpus_and(sd->span, sd->span, cpu_default_map);
#endif
sd->parent = p;
cpus_and(sd->span, sd->span, cpu_default_map);
#endif