---

yaml --- r: 176245 b: refs/heads/master c: 4e25b25 h: refs/heads/master i: 176243: 14dfa9f v: v3
git-mirror · Dec 15, 2009 · a20edb2 · a20edb2
1 parent 5d6554c
commit a20edb2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06808b0827e1cd14eedc96bac2655d5b37ac246c
+refs/heads/master: 4e25b2576efda24c02e2d6b9bcb5965a3f865f33
diff --git a/trunk/arch/ia64/include/asm/numa.h b/trunk/arch/ia64/include/asm/numa.h
@@ -22,8 +22,6 @@
 
 #include <asm/mmzone.h>
 
-#define NUMA_NO_NODE	-1
-
 extern u16 cpu_to_node_map[NR_CPUS] __cacheline_aligned;
 extern cpumask_t node_to_cpu_mask[MAX_NUMNODES] __cacheline_aligned;
 extern pg_data_t *pgdat_list[MAX_NUMNODES];

diff --git a/trunk/arch/x86/include/asm/topology.h b/trunk/arch/x86/include/asm/topology.h
@@ -35,11 +35,16 @@
 # endif
 #endif
 
-/* Node not present */
-#define NUMA_NO_NODE	(-1)
+/*
+ * to preserve the visibility of NUMA_NO_NODE definition,
+ * moved to there from here.  May be used independent of
+ * CONFIG_NUMA.
+ */
+#include <linux/numa.h>
 
 #ifdef CONFIG_NUMA
 #include <linux/cpumask.h>
+
 #include <asm/mpspec.h>
 
 #ifdef CONFIG_X86_32

diff --git a/trunk/include/linux/numa.h b/trunk/include/linux/numa.h
@@ -10,4 +10,6 @@
 
 #define MAX_NUMNODES    (1 << NODES_SHIFT)
 
+#define	NUMA_NO_NODE	(-1)
+
 #endif /* _LINUX_NUMA_H */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,4 +10,6 @@

		#define MAX_NUMNODES (1 << NODES_SHIFT)

		#define NUMA_NO_NODE (-1)

		#endif /* _LINUX_NUMA_H */