Everyone defines it, and only one person uses it (arch/mips/sgi-ip27/ip27-nmi.c). So just open code it there.
Unified · Split
| @@ -43,11 +43,6 @@ · 42 unmodified lines | |||
| 43 | */ | 43 | */ |
| 44 | #define parent_node(nid) (nid) | 44 | #define parent_node(nid) (nid) |
| 45 | 45 | ||
| 46 | /* | ||
| 47 | * Returns the number of the first CPU on Node 'node'. | ||
| 48 | */ | ||
| 49 | #define node_to_first_cpu(node) (cpumask_first(cpumask_of_node(node))) | ||
| 50 | |||
| 51 | /* | 46 | /* |
| 52 | * Determines the node for a given pci bus | 47 | * Determines the node for a given pci bus |
| 53 | */ | 48 | */ |
| @@ -26,7 +26,6 @@ extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS]; · 25 unmodified lines | |||
| 26 | #define parent_node(node) (node) | 26 | #define parent_node(node) (node) |
| 27 | #define node_to_cpumask(node) (hub_data(node)->h_cpus) | 27 | #define node_to_cpumask(node) (hub_data(node)->h_cpus) |
| 28 | #define cpumask_of_node(node) (&hub_data(node)->h_cpus) | 28 | #define cpumask_of_node(node) (&hub_data(node)->h_cpus) |
| 29 | #define node_to_first_cpu(node) (cpumask_first(cpumask_of_node(node))) | ||
| 30 | struct pci_bus; | 29 | struct pci_bus; |
| 31 | extern int pcibus_to_node(struct pci_bus *); | 30 | extern int pcibus_to_node(struct pci_bus *); |
| 32 | 31 | ||
| @@ -219,7 +219,7 @@ cont_nmi_dump(void) · 218 unmodified lines | |||
| 219 | if (i == 1000) { | 219 | if (i == 1000) { |
| 220 | for_each_online_node(node) | 220 | for_each_online_node(node) |
| 221 | if (NODEPDA(node)->dump_count == 0) { | 221 | if (NODEPDA(node)->dump_count == 0) { |
| 222 | cpu = node_to_first_cpu(node); | 222 | cpu = cpumask_first(cpumask_of_node(node)); |
| 223 | for (n=0; n < CNODE_NUM_CPUS(node); cpu++, n++) { | 223 | for (n=0; n < CNODE_NUM_CPUS(node); cpu++, n++) { |
| 224 | CPUMASK_SETB(nmied_cpus, cpu); | 224 | CPUMASK_SETB(nmied_cpus, cpu); |
| 225 | /* | 225 | /* |
| @@ -24,11 +24,6 @@ static inline cpumask_t node_to_cpumask(int node) · 23 unmodified lines | |||
| 24 | 24 | ||
| 25 | #define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) | 25 | #define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) |
| 26 | 26 | ||
| 27 | static inline int node_to_first_cpu(int node) | ||
| 28 | { | ||
| 29 | return cpumask_first(cpumask_of_node(node)); | ||
| 30 | } | ||
| 31 | |||
| 32 | int of_node_to_nid(struct device_node *device); | 27 | int of_node_to_nid(struct device_node *device); |
| 33 | 28 | ||
| 34 | struct pci_bus; | 29 | struct pci_bus; |
| @@ -33,7 +33,6 @@ · 32 unmodified lines | |||
| 33 | 33 | ||
| 34 | #define node_to_cpumask(node) ((void)node, cpu_online_map) | 34 | #define node_to_cpumask(node) ((void)node, cpu_online_map) |
| 35 | #define cpumask_of_node(node) ((void)node, cpu_online_mask) | 35 | #define cpumask_of_node(node) ((void)node, cpu_online_mask) |
| 36 | #define node_to_first_cpu(node) ((void)(node),0) | ||
| 37 | 36 | ||
| 38 | #define pcibus_to_node(bus) ((void)(bus), -1) | 37 | #define pcibus_to_node(bus) ((void)(bus), -1) |
| 39 | #define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ | 38 | #define pcibus_to_cpumask(bus) (pcibus_to_node(bus) == -1 ? \ |
| @@ -28,11 +28,6 @@ static inline cpumask_t node_to_cpumask(int node) · 27 unmodified lines | |||
| 28 | #define node_to_cpumask_ptr_next(v, node) \ | 28 | #define node_to_cpumask_ptr_next(v, node) \ |
| 29 | v = &(numa_cpumask_lookup_table[node]) | 29 | v = &(numa_cpumask_lookup_table[node]) |
| 30 | 30 | ||
| 31 | static inline int node_to_first_cpu(int node) | ||
| 32 | { | ||
| 33 | return cpumask_first(cpumask_of_node(node)); | ||
| 34 | } | ||
| 35 | |||
| 36 | struct pci_bus; | 31 | struct pci_bus; |
| 37 | #ifdef CONFIG_PCI | 32 | #ifdef CONFIG_PCI |
| 38 | extern int pcibus_to_node(struct pci_bus *pbus); | 33 | extern int pcibus_to_node(struct pci_bus *pbus); |
| @@ -217,10 +217,6 @@ static inline cpumask_t node_to_cpumask(int node) · 216 unmodified lines | |||
| 217 | { | 217 | { |
| 218 | return cpu_online_map; | 218 | return cpu_online_map; |
| 219 | } | 219 | } |
| 220 | static inline int node_to_first_cpu(int node) | ||
| 221 | { | ||
| 222 | return first_cpu(cpu_online_map); | ||
| 223 | } | ||
| 224 | 220 | ||
| 225 | static inline void setup_node_to_cpumask_map(void) { } | 221 | static inline void setup_node_to_cpumask_map(void) { } |
| 226 | 222 | ||
| @@ -237,14 +233,6 @@ static inline void setup_node_to_cpumask_map(void) { } · 10 unmodified lines | |||
| 237 | 233 | ||
| 238 | #include <asm-generic/topology.h> | 234 | #include <asm-generic/topology.h> |
| 239 | 235 | ||
| 240 | #ifdef CONFIG_NUMA | ||
| 241 | /* Returns the number of the first CPU on Node 'node'. */ | ||
| 242 | static inline int node_to_first_cpu(int node) | ||
| 243 | { | ||
| 244 | return cpumask_first(cpumask_of_node(node)); | ||
| 245 | } | ||
| 246 | #endif | ||
| 247 | |||
| 248 | extern cpumask_t cpu_coregroup_map(int cpu); | 236 | extern cpumask_t cpu_coregroup_map(int cpu); |
| 249 | extern const struct cpumask *cpu_coregroup_mask(int cpu); | 237 | extern const struct cpumask *cpu_coregroup_mask(int cpu); |
| 250 | 238 | ||
| @@ -43,9 +43,6 @@ · 42 unmodified lines | |||
| 43 | #ifndef cpumask_of_node | 43 | #ifndef cpumask_of_node |
| 44 | #define cpumask_of_node(node) ((void)node, cpu_online_mask) | 44 | #define cpumask_of_node(node) ((void)node, cpu_online_mask) |
| 45 | #endif | 45 | #endif |
| 46 | #ifndef node_to_first_cpu | ||
| 47 | #define node_to_first_cpu(node) ((void)(node),0) | ||
| 48 | #endif | ||
| 49 | #ifndef pcibus_to_node | 46 | #ifndef pcibus_to_node |
| 50 | #define pcibus_to_node(bus) ((void)(bus), -1) | 47 | #define pcibus_to_node(bus) ((void)(bus), -1) |
| 51 | #endif | 48 | #endif |