cpumask: remove node_to_first_cpu
PATCH 3/10 cpumask: remove node_to_first_cpu
Everyone defines it, and only one person uses it (arch/mips/sgi-ip27/ip27-nmi.c). So just open code it there.
Signed-off-by Rusty Russell <[email protected]>
--- arch/ia64/include/asm/topology.h | 5 ----- arch/mips/include/asm/mach-ip27/topology.h | 1 - arch/mips/sgi-ip27/ip27-nmi.c | 2 +- arch/powerpc/include/asm/topology.h | 5 ----- arch/sh/include/asm/topology.h | 1 - arch/sparc/include/asm/topology_64.h | 5 ----- arch/x86/include/asm/topology.h | 12 ------------ include/asm-generic/topology.h | 3 --- 8 files changed, 1 insertion(+), 33 deletions(-)
arch/ia64/include/asm/topology.h +0 -5
@@ -42,11 +42,6 @@* the help of node_distance(). */ #define parent_node (nid) (nid) - -/* -* Returns the number of the first CPU on Node 'node'. -*/ -#define node_to_first_cpu (node) (cpumask_first(cpumask_of_node(node)))/* * Determines the node for a given pci bus
arch/mips/include/asm/mach-ip27/topology.h +0 -1
@@ -26,7 +26,6 @@ extern struct cpuinfo_ip27 sn_cpu_info[N#define parent_node (node) (node)#define node_to_cpumask (node) (hub_data(node)->h_cpus)#define cpumask_of_node (node) (&hub_data(node)->h_cpus) -#define node_to_first_cpu (node) (cpumask_first(cpumask_of_node(node)))struct pci_bus ;extern int pcibus_to_node (struct pci_bus *);
arch/mips/sgi-ip27/ip27-nmi.c +1 -1
@@ -219,7 +219,7 @@ cont_nmi_dump(void)if (i ==1000 ) {for_each_online_node (node)if (NODEPDA (node)->dump_count ==0 ) { - cpu =node_to_first_cpu (node); + cpu =cpumask_first (cpumask_of_node (node));for (n=0 ; n <CNODE_NUM_CPUS (node); cpu++, n++) {CPUMASK_SETB (nmied_cpus, cpu);/*
arch/powerpc/include/asm/topology.h +0 -5
@@ -23,11 +23,6 @@ static inline cpumask_t node_to_cpumask( }#define cpumask_of_node (node) (&numa_cpumask_lookup_table[node]) - -static inline int node_to_first_cpu (int node) -{ -return cpumask_first (cpumask_of_node (node)); -}int of_node_to_nid (struct device_node *device);
arch/sh/include/asm/topology.h +0 -1
@@ -33,7 +33,6 @@#define node_to_cpumask (node) ((void)node, cpu_online_map)#define cpumask_of_node (node) ((void)node, cpu_online_mask) -#define node_to_first_cpu (node) ((void)(node),0)#define pcibus_to_node (bus) ((void)(bus), -1)#define pcibus_to_cpumask (bus) (pcibus_to_node(bus) == -1 ? \
arch/sparc/include/asm/topology_64.h +0 -5
@@ -27,11 +27,6 @@ static inline cpumask_t node_to_cpumask(#define node_to_cpumask_ptr_next (v, node) \ v = &(numa_cpumask_lookup_table[node]) - -static inline int node_to_first_cpu (int node) -{ -return cpumask_first (cpumask_of_node (node)); -}struct pci_bus ;#ifdef CONFIG_PCI
arch/x86/include/asm/topology.h +0 -12
@@ -204,10 +204,6 @@ static inline cpumask_t node_to_cpumask( {return cpu_online_map; } -static inline int node_to_first_cpu (int node) -{ -return first_cpu (cpu_online_map); -}/* * Replace default node_to_cpumask_ptr with optimized version
@@ -221,14 +217,6 @@ static inline int node_to_first_cpu(int#endif #include <asm-generic/topology.h> - -#ifdef CONFIG_NUMA -/* Returns the number of the first CPU on Node 'node'. */ -static inline int node_to_first_cpu (int node) -{ -return cpumask_first (cpumask_of_node (node)); -} -#endif extern cpumask_t cpu_coregroup_map (int cpu);extern const struct cpumask *cpu_coregroup_mask (int cpu);
include/asm-generic/topology.h +0 -3
@@ -43,9 +43,6 @@#ifndef cpumask_of_node#define cpumask_of_node (node) ((void)node, cpu_online_mask)#endif -#ifndef node_to_first_cpu -#define node_to_first_cpu (node) ((void)(node),0) -#endif #ifndef pcibus_to_node#define pcibus_to_node (bus) ((void)(bus), -1)#endif