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

Commit a70f7302 authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: replace node_to_cpumask with cpumask_of_node. 



Impact: cleanup

node_to_cpumask (and the blecherous node_to_cpumask_ptr which
contained a declaration) are replaced now everyone implements
cpumask_of_node.

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

drivers/base/node.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static struct sysdev_class node_class = { 
static ssize_t node_read_cpumap(struct sys_device *dev, int type, char *buf)

{

	struct node *node_dev = to_node(dev);

	node_to_cpumask_ptr(mask, node_dev->sysdev.id);

	const struct cpumask *mask = cpumask_of_node(node_dev->sysdev.id);

	int len;



	/* 2008/04/07: buf currently PAGE_SIZE, need 9 chars per 32 bits. */

drivers/pci/pci-driver.c

+1 −2
Original line number Diff line number Diff line
@@ -212,10 +212,9 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, 
	node = dev_to_node(&dev->dev);

	if (node >= 0) {

		int cpu;

		node_to_cpumask_ptr(nodecpumask, node);



		get_online_cpus();

		cpu = cpumask_any_and(nodecpumask, cpu_online_mask);

		cpu = cpumask_any_and(cpumask_of_node(node), cpu_online_mask);

		if (cpu < nr_cpu_ids)

			error = work_on_cpu(cpu, local_pci_probe, &ddi);

		else

include/linux/topology.h

+1 −5
Original line number Diff line number Diff line
@@ -38,11 +38,7 @@ 
#endif



#ifndef nr_cpus_node

#define nr_cpus_node(node)				\

	({						\

		node_to_cpumask_ptr(__tmp__, node);	\

		cpus_weight(*__tmp__);			\

	})

#define nr_cpus_node(node) cpumask_weight(cpumask_of_node(node))

#endif



#define for_each_node_with_cpus(node)			\

mm/page_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -2134,7 +2134,7 @@ static int find_next_best_node(int node, nodemask_t *used_node_mask) 
	int n, val;

	int min_val = INT_MAX;

	int best_node = -1;

	node_to_cpumask_ptr(tmp, 0);

	const struct cpumask *tmp = cpumask_of_node(0);



	/* Use the local node if we haven't already */

	if (!node_isset(node, *used_node_mask)) {
@@ -2155,8 +2155,8 @@ static int find_next_best_node(int node, nodemask_t *used_node_mask) 
		val += (n < node);



		/* Give preference to headless and unused nodes */

		node_to_cpumask_ptr_next(tmp, n);

		if (!cpus_empty(*tmp))

		tmp = cpumask_of_node(n);

		if (!cpumask_empty(tmp))

			val += PENALTY_FOR_NODE_WITH_CPUS;



		/* Slight preference for less loaded node */

mm/quicklist.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ static unsigned long max_pages(unsigned long min_pages) 
	int node = numa_node_id();

	struct zone *zones = NODE_DATA(node)->node_zones;

	int num_cpus_on_node;

	node_to_cpumask_ptr(cpumask_on_node, node);

	const struct cpumask *cpumask_on_node = cpumask_of_node(node);



	node_free_pages =

#ifdef CONFIG_ZONE_DMA