From: John Garry <john.g.garry@oracle.com>
To: chenhuacai@kernel.org, kernel@xen0n.name,
jiaxun.yang@flygoat.com, tsbogend@alpha.franken.de,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, hpa@zytor.com, luto@kernel.org,
peterz@infradead.org, arnd@arndb.de, x86@kernel.org
Cc: loongarch@lists.linux.dev, linux-kernel@vger.kernel.org,
linux-mips@vger.kernel.org, linux-arch@vger.kernel.org,
vulab@iscas.ac.cn, gregkh@linuxfoundation.org, rafael@kernel.org,
dakr@kernel.org, John Garry <john.g.garry@oracle.com>
Subject: [PATCH 1/4] include/asm-generic/topology.h: Remove unused definition of cpumask_of_node()
Date: Mon, 5 Jan 2026 10:05:44 +0000 [thread overview]
Message-ID: <20260105100547.287332-2-john.g.garry@oracle.com> (raw)
In-Reply-To: <20260105100547.287332-1-john.g.garry@oracle.com>
The definition of cpumask_of_node() in question is guarded by conflicting
CONFIG_NUMA and !CONFIG_NUMA checks, so remove it.
Signed-off-by: John Garry <john.g.garry@oracle.com>
---
include/asm-generic/topology.h | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/include/asm-generic/topology.h b/include/asm-generic/topology.h
index 4dbe715be65b4..9865ba48c5b16 100644
--- a/include/asm-generic/topology.h
+++ b/include/asm-generic/topology.h
@@ -45,11 +45,7 @@
#endif
#ifndef cpumask_of_node
- #ifdef CONFIG_NUMA
- #define cpumask_of_node(node) ((node) == 0 ? cpu_online_mask : cpu_none_mask)
- #else
- #define cpumask_of_node(node) ((void)(node), cpu_online_mask)
- #endif
+#define cpumask_of_node(node) ((void)(node), cpu_online_mask)
#endif
#ifndef pcibus_to_node
#define pcibus_to_node(bus) ((void)(bus), -1)
@@ -61,7 +57,7 @@
cpumask_of_node(pcibus_to_node(bus)))
#endif
-#endif /* CONFIG_NUMA */
+#endif /* !CONFIG_NUMA */
#if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
--
2.43.5
next prev parent reply other threads:[~2026-01-05 10:07 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-05 10:05 [PATCH 0/4] Make cpumask_of_node() robust against NUMA_NO_NODE John Garry
2026-01-05 10:05 ` John Garry [this message]
2026-01-05 10:05 ` [PATCH 2/4] LoongArch: " John Garry
2026-01-05 12:54 ` Huacai Chen
2026-01-05 14:09 ` John Garry
2026-01-05 10:05 ` [PATCH 3/4] MIPS: Loongson: " John Garry
2026-01-05 10:05 ` [PATCH 4/4] x86/cpu/topology: " John Garry
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=20260105100547.287332-2-john.g.garry@oracle.com \
--to=john.g.garry@oracle.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=chenhuacai@kernel.org \
--cc=dakr@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hpa@zytor.com \
--cc=jiaxun.yang@flygoat.com \
--cc=kernel@xen0n.name \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=loongarch@lists.linux.dev \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=rafael@kernel.org \
--cc=tglx@linutronix.de \
--cc=tsbogend@alpha.franken.de \
--cc=vulab@iscas.ac.cn \
--cc=x86@kernel.org \
/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