[trivial] include <asm-generic/topology.h>

[trivial] include <asm-generic/topology.h>

Post by Matthew Dobso » Fri, 06 Dec 2002 02:20:11



Linus,
        For a small bit of sanity and a savings of 9 lines of code, we should
be including the generic topology macros in the alpha & ppc64 topology
files, rather than just redefining them.  It is much easier to keep all
the generic topology macros in sync this way, too.

Cheers!

-Matt


  asm-alpha/topology.h |   19 +++++++------------
  asm-ppc64/topology.h |    8 ++------
  2 files changed, 9 insertions(+), 18 deletions(-)

[ use_generic_topo-2.5.50.patch 1K ]
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.50-vanilla/include/asm-alpha/topology.h linux-2.5.50-use_generic/include/asm-alpha/topology.h
--- linux-2.5.50-vanilla/include/asm-alpha/topology.h   Wed Nov 27 14:35:53 2002

 #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 */
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.50-vanilla/include/asm-ppc64/topology.h linux-2.5.50-use_generic/include/asm-ppc64/topology.h
--- linux-2.5.50-vanilla/include/asm-ppc64/topology.h   Wed Nov 27 14:36:22 2002

 #else /* !CONFIG_NUMA */

-#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)
+/* If non-NUMA, grab the generic macros */
+#include <asm-generic/topology.h>

 #endif /* CONFIG_NUMA */