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

Commit b236da69 authored by Changli Gao's avatar Changli Gao Committed by David S. Miller
Browse files

net: use NUMA_NO_NODE instead of the magic number -1 



Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent caafa842

include/linux/netdevice.h

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ static inline int netdev_queue_numa_node_read(const struct netdev_queue *q) 
#if defined(CONFIG_XPS) && defined(CONFIG_NUMA)

	return q->numa_node;

#else

	return -1;

	return NUMA_NO_NODE;

#endif

}

net/core/dev.c

+1 −1
Original line number Diff line number Diff line
@@ -5121,7 +5121,7 @@ static void netdev_init_one_queue(struct net_device *dev, 
	spin_lock_init(&queue->_xmit_lock);

	netdev_set_xmit_lockdep_class(&queue->_xmit_lock, dev->type);

	queue->xmit_lock_owner = -1;

	netdev_queue_numa_node_write(queue, -1);

	netdev_queue_numa_node_write(queue, NUMA_NO_NODE);

	queue->dev = dev;

}

net/core/net-sysfs.c

+2 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,8 @@ static ssize_t store_xps_map(struct netdev_queue *queue, 
	if (dev_maps)

		call_rcu(&dev_maps->rcu, xps_dev_maps_release);



	netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node : -1);

	netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node :

					    NUMA_NO_NODE);



	mutex_unlock(&xps_map_mutex);