From: Matthew Dobson <colpatch@us.ibm.com>
To: Linus Torvalds <torvalds@transmeta.com>,
Anton Blanchard <anton@samba.org>,
Peter Rival <frival@zk3.dec.com>
Cc: linux-kernel@vger.kernel.org
Subject: [patch] Fix asm-alpha/topology.h & asm-ppc64/topology.h
Date: Tue, 12 Nov 2002 15:36:24 -0800 [thread overview]
Message-ID: <3DD19078.6030608@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 371 bytes --]
Linus,
This patch fixes 2 files where non-NUMA macros are redefined, rather
than including the generic non-NUMA ones already defined.
Please apply.
[mcd@arrakis patches]$ diffstat use_generic_topo-2.5.47.patch
asm-alpha/topology.h | 19 +++++++------------
asm-ppc64/topology.h | 8 ++------
2 files changed, 9 insertions(+), 18 deletions(-)
Cheers!
-Matt
[-- Attachment #2: use_generic_topo-2.5.47.patch --]
[-- Type: text/plain, Size: 1899 bytes --]
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
+++ linux-2.5.46-generic_topo_fix/include/asm-alpha/topology.h Mon Nov 4 16:45:42 2002
@@ -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 */
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
+++ linux-2.5.46-generic_topo_fix/include/asm-ppc64/topology.h Mon Nov 4 16:45:42 2002
@@ -48,12 +48,8 @@
#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 */
reply other threads:[~2002-11-12 23:34 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3DD19078.6030608@us.ibm.com \
--to=colpatch@us.ibm.com \
--cc=anton@samba.org \
--cc=frival@zk3.dec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@transmeta.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox