Fix asm-alpha/topology.h & asm-ppc64/topology.h

Fix asm-alpha/topology.h & asm-ppc64/topology.h

Post by Matthew Dobso » Thu, 14 Nov 2002 01:50:06



Linus,
        This patch fixes 2 files where non-NUMA macros are redefined, rather
than including the generic non-NUMA ones already defined.

Please apply.


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

Cheers!

-Matt

[ use_generic_topo-2.5.47.patch 1K ]
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.46-vanilla/include/asm-alpha/topology.h linux-2.5.46-generic_topo_fix/include/asm-alpha/topology.h
--- linux-2.5.46-vanilla/include/asm-alpha/topology.h   Mon Nov  4 14:30:15 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.46-vanilla/include/asm-ppc64/topology.h linux-2.5.46-generic_topo_fix/include/asm-ppc64/topology.h
--- linux-2.5.46-vanilla/include/asm-ppc64/topology.h   Mon Nov  4 14:30:52 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 */

 
 
 

1. Fix asm-i386/topology.h

Linus,
        This patch fixes some slow, quickly written macros in
asm-i386/topology.h.  The new versions use value caching in arrays to
greatly speed up topology queries.

Please apply.


  arch/i386/kernel/smpboot.c  |   43
+++++++++++++++++++++++++++++++++++++++++++
  include/asm-i386/smpboot.h  |    8 ++++++++
  include/asm-i386/topology.h |   43
+++++--------------------------------------
  3 files changed, 56 insertions(+), 38 deletions(-)

Cheers!

-Matt

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. Just installed and I need help

3. use asm-generic/topology.h

4. Where can I get a driver for my <insert brand and model> printer?

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

6. adding linux to my NT-loader

7. AT&T asm syntax but not IBM asm syntax?

8. IBM 701c laptop ????

9. WISHFUL SEARCH: Intel Asm -> GNU Asm format converter

10. GCC gas x86 asm -> Intel X86 asm ?

11. linux asm and minux asm?

12. C99 initializers for asm-alpha/include/xor.h

13. asm volatile (...); vs asm (...);