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]
/
include
/
asm-ia64
/
mmzone.h
diff --git
a/include/asm-ia64/mmzone.h
b/include/asm-ia64/mmzone.h
index
89c392d
..
9491dac
100644
(file)
--- a/
include/asm-ia64/mmzone.h
+++ b/
include/asm-ia64/mmzone.h
@@
-11,7
+11,7
@@
#ifndef _ASM_IA64_MMZONE_H
#define _ASM_IA64_MMZONE_H
#ifndef _ASM_IA64_MMZONE_H
#define _ASM_IA64_MMZONE_H
-#include <linux/
config
.h>
+#include <linux/
numa
.h>
#include <asm/page.h>
#include <asm/meminit.h>
#include <asm/page.h>
#include <asm/meminit.h>
@@
-19,15
+19,14
@@
#ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8
#ifdef CONFIG_IA64_DIG /* DIG systems are small */
# define MAX_PHYSNODE_ID 8
-# define NR_NODES 8
-# define NR_NODE_MEMBLKS (NR_NODES * 8)
+# define NR_NODE_MEMBLKS (MAX_NUMNODES * 8)
#else /* sn2 is the biggest case, so we use that if !DIG */
# define MAX_PHYSNODE_ID 2048
#else /* sn2 is the biggest case, so we use that if !DIG */
# define MAX_PHYSNODE_ID 2048
-# define NR_NODES 256
-# define NR_NODE_MEMBLKS (NR_NODES * 4)
+# define NR_NODE_MEMBLKS (MAX_NUMNODES * 4)
#endif
#else /* CONFIG_DISCONTIGMEM */
#endif
#else /* CONFIG_DISCONTIGMEM */
-# define NR_NODE_MEMBLKS
4
+# define NR_NODE_MEMBLKS
(MAX_NUMNODES * 4)
#endif /* CONFIG_DISCONTIGMEM */
#endif /* CONFIG_DISCONTIGMEM */
+
#endif /* _ASM_IA64_MMZONE_H */
#endif /* _ASM_IA64_MMZONE_H */