Skip to content

Commit eed444d

Browse files
johnpgarryarndb
authored andcommitted
include/asm-generic/topology.h: Remove unused definition of cpumask_of_node()
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> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 0f61b18 commit eed444d

1 file changed

Lines changed: 2 additions & 6 deletions

File tree

include/asm-generic/topology.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,7 @@
4545
#endif
4646

4747
#ifndef cpumask_of_node
48-
#ifdef CONFIG_NUMA
49-
#define cpumask_of_node(node) ((node) == 0 ? cpu_online_mask : cpu_none_mask)
50-
#else
51-
#define cpumask_of_node(node) ((void)(node), cpu_online_mask)
52-
#endif
48+
#define cpumask_of_node(node) ((void)(node), cpu_online_mask)
5349
#endif
5450
#ifndef pcibus_to_node
5551
#define pcibus_to_node(bus) ((void)(bus), -1)
@@ -61,7 +57,7 @@
6157
cpumask_of_node(pcibus_to_node(bus)))
6258
#endif
6359

64-
#endif /* CONFIG_NUMA */
60+
#endif /* !CONFIG_NUMA */
6561

6662
#if !defined(CONFIG_NUMA) || !defined(CONFIG_HAVE_MEMORYLESS_NODES)
6763

0 commit comments

Comments
 (0)