cpumask: sparc/sparc64: Introduce cpumask_of_node to replace node_to_cpumask() Signed-off-by: Rusty Russell --- arch/sparc/include/asm/topology_64.h | 5 ++--- arch/sparc64/kernel/of_device.c | 2 +- arch/sparc64/kernel/pci_msi.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff -r 0ab5450c7508 arch/sparc/include/asm/topology_64.h --- a/arch/sparc/include/asm/topology_64.h Fri Nov 07 10:23:48 2008 +1100 +++ b/arch/sparc/include/asm/topology_64.h Fri Nov 07 10:48:45 2008 +1100 @@ -16,6 +16,7 @@ static inline cpumask_t node_to_cpumask( { return numa_cpumask_lookup_table[node]; } +#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node]) /* Returns a pointer to the cpumask of CPUs on Node 'node'. */ #define node_to_cpumask_ptr(v, node) \ @@ -26,9 +27,7 @@ static inline cpumask_t node_to_cpumask( static inline int node_to_first_cpu(int node) { - cpumask_t tmp; - tmp = node_to_cpumask(node); - return first_cpu(tmp); + return cpumask_first(cpumask_of_node(node)); } struct pci_bus; diff -r 0ab5450c7508 arch/sparc64/kernel/of_device.c --- a/arch/sparc64/kernel/of_device.c Fri Nov 07 10:23:48 2008 +1100 +++ b/arch/sparc64/kernel/of_device.c Fri Nov 07 10:48:45 2008 +1100 @@ -778,7 +778,7 @@ out: out: nid = of_node_to_nid(dp); if (nid != -1) { - cpumask_t numa_mask = node_to_cpumask(nid); + cpumask_t numa_mask = *cpumask_of_node(nid); irq_set_affinity(irq, numa_mask); } diff -r 0ab5450c7508 arch/sparc64/kernel/pci_msi.c --- a/arch/sparc64/kernel/pci_msi.c Fri Nov 07 10:23:48 2008 +1100 +++ b/arch/sparc64/kernel/pci_msi.c Fri Nov 07 10:48:45 2008 +1100 @@ -286,7 +286,7 @@ static int bringup_one_msi_queue(struct nid = pbm->numa_node; if (nid != -1) { - cpumask_t numa_mask = node_to_cpumask(nid); + cpumask_t numa_mask = *cpumask_of_node(nid); irq_set_affinity(irq, numa_mask); }