[TRIVIAL] Use asm-generic/topology.h.

From colpatch@us.ibm.com

diff --git a/include/asm-alpha/topology.h b/include/asm-alpha/topology.h
index f3c6cd7ae49139b9fae1afe54d4dc4942821f6d9..e80327049f704282c2c369c0d0d6995350e3c86c 100644 (file)
--- a/include/asm-alpha/topology.h
+++ b/include/asm-alpha/topology.h
@@ -1,20 +1,15 @@
 #ifndef _ASM_ALPHA_TOPOLOGY_H
 #define _ASM_ALPHA_TOPOLOGY_H
 
-#ifdef CONFIG_NUMA
-#ifdef CONFIG_ALPHA_WILDFIRE
+#if defined(CONFIG_NUMA) && defined(CONFIG_ALPHA_WILDFIRE)
+
 /* With wildfire assume 4 CPUs per node */
 #define __cpu_to_node(cpu)             ((cpu) >> 2)
-#endif /* CONFIG_ALPHA_WILDFIRE */
-#endif /* CONFIG_NUMA */
 
-#if !defined(CONFIG_NUMA) || !defined(CONFIG_ALPHA_WILDFIRE)
-#define __cpu_to_node(cpu)             (0)
-#define __memblk_to_node(memblk)       (0)
-#define __parent_node(nid)             (0)
-#define __node_to_first_cpu(node)      (0)
-#define __node_to_cpu_mask(node)       (cpu_online_map)
-#define __node_to_memblk(node)         (0)
-#endif /* !CONFIG_NUMA || !CONFIG_ALPHA_WILDFIRE */
+#else /* !CONFIG_NUMA || !CONFIG_ALPHA_WILDFIRE */
+
+#include <asm-generic/topology.h>
+
+#endif /* CONFIG_NUMA && CONFIG_ALPHA_WILDFIRE */
 
 #endif /* _ASM_ALPHA_TOPOLOGY_H */