X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-x86_64%2Fnuma.h;h=5c363a1482e43ecada598942d124b87d64a0041a;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=9962665c3a980de1b5e74d2686eae7f917768d43;hpb=5273a3df6485dc2ad6aa7ddd441b9a21970f003b;p=linux-2.6.git

diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h
index 9962665c3..5c363a148 100644
--- a/include/asm-x86_64/numa.h
+++ b/include/asm-x86_64/numa.h
@@ -1,21 +1,21 @@
 #ifndef _ASM_X8664_NUMA_H 
 #define _ASM_X8664_NUMA_H 1
 
-#define MAXNODE 8 
-#define NODEMASK 0xff
+#include <linux/nodemask.h>
+#include <asm/numnodes.h>
 
 struct node { 
 	u64 start,end; 
 };
 
-#define for_all_nodes(x) for ((x) = 0; (x) < numnodes; (x)++) \
-				if (node_online(x))
-
-extern int compute_hash_shift(struct node *nodes);
+extern int compute_hash_shift(struct node *nodes, int numnodes);
 
 #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
 
 extern void numa_add_cpu(int cpu);
 extern void numa_init_array(void);
+extern int numa_off;
+
+#define NUMA_NO_NODE 0xff
 
 #endif