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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-mips
/
mach-ip27
/
topology.h
diff --git
a/include/asm-mips/mach-ip27/topology.h
b/include/asm-mips/mach-ip27/topology.h
index
59d26b5
..
44790fd
100644
(file)
--- a/
include/asm-mips/mach-ip27/topology.h
+++ b/
include/asm-mips/mach-ip27/topology.h
@@
-1,7
+1,6
@@
#ifndef _ASM_MACH_TOPOLOGY_H
#define _ASM_MACH_TOPOLOGY_H 1
#ifndef _ASM_MACH_TOPOLOGY_H
#define _ASM_MACH_TOPOLOGY_H 1
-#include <asm/sn/arch.h>
#include <asm/sn/hub.h>
#include <asm/mmzone.h>
#include <asm/sn/hub.h>
#include <asm/mmzone.h>
@@
-22,6
+21,7
@@
extern unsigned char __node_distances[MAX_COMPACT_NODES][MAX_COMPACT_NODES];
#define SD_NODE_INIT (struct sched_domain) { \
.span = CPU_MASK_NONE, \
.parent = NULL, \
#define SD_NODE_INIT (struct sched_domain) { \
.span = CPU_MASK_NONE, \
.parent = NULL, \
+ .child = NULL, \
.groups = NULL, \
.min_interval = 8, \
.max_interval = 32, \
.groups = NULL, \
.min_interval = 8, \
.max_interval = 32, \