Update ia64 patch to 2.5.72-030619

[linux-flexiantxendom0-3.2.10.git] / include / asm-ia64 / topology.h

diff --git a/include/asm-ia64/topology.h b/include/asm-ia64/topology.h
index bedeca6..f6b971b 100644 (file)
--- a/include/asm-ia64/topology.h
+++ b/include/asm-ia64/topology.h
@@ -28,11 +28,6 @@
  */
 #define node_to_cpumask(node) (node_to_cpu_mask[node])
 
-#else
-#define cpu_to_node(cpu) (0)
-#define node_to_cpumask(node) (phys_cpu_present_map)
-#endif
-
 /*
  * Returns the number of the node containing MemBlk 'memblk'
  */
@@ -63,4 +58,10 @@
 /* Cross-node load balancing interval. */
 #define NODE_BALANCE_RATE 10
 
+void build_cpu_to_node_map(void);
+
+#endif /* CONFIG_NUMA */
+
+#include <asm-generic/topology.h>
+
 #endif /* _ASM_IA64_TOPOLOGY_H */