From 38a3522004a5e09d393631ce53255e242af1c9d0 Mon Sep 17 00:00:00 2001 From: Changli Gao Date: Tue, 14 Dec 2010 03:09:15 +0000 Subject: [PATCH] --- yaml --- r: 225186 b: refs/heads/master c: b236da6931e2482bfe44a7865dd4e7bb036f3496 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/netdevice.h | 2 +- trunk/net/core/dev.c | 2 +- trunk/net/core/net-sysfs.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d3d61e838fae..99fa5cb3f0f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caafa84251b886feb6cdf23d50e2cc99dcdaaaf3 +refs/heads/master: b236da6931e2482bfe44a7865dd4e7bb036f3496 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index 445e6825f8eb..cc916c5c3279 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -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 } diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index b25dd087f06a..7ac26d2b9722 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -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; } diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index 85e8b5326dd6..e23c01be5a5b 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -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);