lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.

(Also replaces powerpc internal uses of node_to_cpumask).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Rusty Russell
2008-12-26 22:23:39 +10:30
parent 7479a2939d
commit 86c6f274f5
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/powerpc/include/asm/topology.h
View File

@@ -22,11 +22,11 @@ static inline cpumask_t node_to_cpumask(int node)
return numa_cpumask_lookup_table[node]; return numa_cpumask_lookup_table[node];
} }
#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node])
static inline int node_to_first_cpu(int node) static inline int node_to_first_cpu(int node)
{ {
cpumask_t tmp; return cpumask_first(cpumask_of_node(node));
tmp = node_to_cpumask(node);
return first_cpu(tmp);
} }
int of_node_to_nid(struct device_node *device); int of_node_to_nid(struct device_node *device);
@@ -46,6 +46,10 @@ static inline int pcibus_to_node(struct pci_bus *bus)
node_to_cpumask(pcibus_to_node(bus)) \ node_to_cpumask(pcibus_to_node(bus)) \
) )
#define cpumask_of_pcibus(bus) (pcibus_to_node(bus) == -1 ? \
cpu_all_mask : \
cpumask_of_node(pcibus_to_node(bus)))
/* sched_domains SD_NODE_INIT for PPC64 machines */ /* sched_domains SD_NODE_INIT for PPC64 machines */
#define SD_NODE_INIT (struct sched_domain) { \ #define SD_NODE_INIT (struct sched_domain) { \
.span = CPU_MASK_NONE, \ .span = CPU_MASK_NONE, \

6
arch/powerpc/platforms/cell/spu_priv1_mmio.c
View File

@@ -80,10 +80,10 @@ static void cpu_affinity_set(struct spu *spu, int cpu)
u64 route; u64 route;
if (nr_cpus_node(spu->node)) { if (nr_cpus_node(spu->node)) {
cpumask_t spumask = node_to_cpumask(spu->node); const struct cpumask *spumask = cpumask_of_node(spu->node),
cpumask_t cpumask = node_to_cpumask(cpu_to_node(cpu)); *cpumask = cpumask_of_node(cpu_to_node(cpu));
if (!cpus_intersects(spumask, cpumask)) if (!cpumask_intersects(spumask, cpumask))
return; return;
} }

4
arch/powerpc/platforms/cell/spufs/sched.c
View File

@@ -166,9 +166,9 @@ void spu_update_sched_info(struct spu_context *ctx)
static int __node_allowed(struct spu_context *ctx, int node) static int __node_allowed(struct spu_context *ctx, int node)
{ {
if (nr_cpus_node(node)) { if (nr_cpus_node(node)) {
cpumask_t mask = node_to_cpumask(node); const struct cpumask *mask = cpumask_of_node(node);
if (cpus_intersects(mask, ctx->cpus_allowed)) if (cpumask_intersects(mask, &ctx->cpus_allowed))
return 1; return 1;
} }