linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-x86_64 / numa.h

diff --git a/include/asm-x86_64/numa.h b/include/asm-x86_64/numa.h
index 9962665..dffe276 100644 (file)
--- a/include/asm-x86_64/numa.h
+++ b/include/asm-x86_64/numa.h
@@ -1,21 +1,38 @@
 #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);
+extern int pxm_to_node(int nid);
 
 #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;
+
+extern void numa_set_node(int cpu, int node);
+
+extern unsigned char apicid_to_node[256];
+#ifdef CONFIG_NUMA
+extern void __init init_cpu_to_node(void);
+
+static inline void clear_node_cpumask(int cpu)
+{
+       clear_bit(cpu, &node_to_cpumask[cpu_to_node(cpu)]);
+}
+
+#else
+#define init_cpu_to_node() do {} while (0)
+#define clear_node_cpumask(cpu) do {} while (0)
+#endif
+
+#define NUMA_NO_NODE 0xff
 
 #endif