Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96d76a74 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: sparc: Introduce cpumask_of_{node,pcibus} to replace {node,pcibus}_to_cpumask 



Impact: New APIs

The old node_to_cpumask/node_to_pcibus returned a cpumask_t: these
return a pointer to a struct cpumask.  Part of removing cpumasks from
the stack.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 393d68fb

arch/sparc/include/asm/topology_64.h

+6 −4
Original line number Diff line number Diff line
@@ -16,8 +16,12 @@ static inline cpumask_t node_to_cpumask(int node) 
{

	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'. */

/*

 * Returns a pointer to the cpumask of CPUs on Node 'node'.

 * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)"

 */

#define node_to_cpumask_ptr(v, node)		\

		cpumask_t *v = &(numa_cpumask_lookup_table[node])
@@ -26,9 +30,7 @@ static inline cpumask_t node_to_cpumask(int node) 


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;

arch/sparc64/kernel/of_device.c

+1 −1
Original line number Diff line number Diff line
@@ -778,7 +778,7 @@ static unsigned int __init build_one_device_irq(struct of_device *op, 
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);

	}

arch/sparc64/kernel/pci_msi.c

+1 −1
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static int bringup_one_msi_queue(struct pci_pbm_info *pbm, 


	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);

	}