Commit 29c337a0 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: remove obsolete node_to_cpumask now everyone uses cpumask_of_node 



Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent b966cd6b

arch/alpha/include/asm/topology.h

+0 −17
Original line number Diff line number Diff line
@@ -22,23 +22,6 @@ static inline int cpu_to_node(int cpu) 
	return node;

}



static inline cpumask_t node_to_cpumask(int node)

{

	cpumask_t node_cpu_mask = CPU_MASK_NONE;

	int cpu;



	for_each_online_cpu(cpu) {

		if (cpu_to_node(cpu) == node)

			cpu_set(cpu, node_cpu_mask);

	}



#ifdef DEBUG_NUMA

	printk("node %d: cpu_mask: %016lx\n", node, node_cpu_mask);

#endif



	return node_cpu_mask;

}



extern struct cpumask node_to_cpumask_map[];

/* FIXME: This is dumb, recalculating every time.  But simple. */

static const struct cpumask *cpumask_of_node(int node)

arch/ia64/include/asm/topology.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
/*

 * Returns a bitmask of CPUs on Node 'node'.

 */

#define node_to_cpumask(node) (node_to_cpu_mask[node])

#define cpumask_of_node(node) (&node_to_cpu_mask[node])



/*

arch/mips/include/asm/mach-ip27/topology.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ extern struct cpuinfo_ip27 sn_cpu_info[NR_CPUS]; 


#define cpu_to_node(cpu)	(sn_cpu_info[(cpu)].p_nodeid)

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

struct pci_bus;

extern int pcibus_to_node(struct pci_bus *);

arch/mips/sgi-ip27/ip27-memory.c

+1 −1
Original line number Diff line number Diff line
@@ -421,7 +421,7 @@ static void __init node_mem_init(cnodeid_t node) 


/*

 * A node with nothing.  We use it to avoid any special casing in

 * node_to_cpumask

 * cpumask_of_node

 */

static struct node_data null_node = {

	.hub = {

arch/powerpc/include/asm/topology.h

+0 −5
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ static inline int cpu_to_node(int cpu) 


#define parent_node(node)	(node)



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



int of_node_to_nid(struct device_node *device);