Skip to content

Commit

Permalink
net-sysfs: fixed minor sparse warning
Browse files Browse the repository at this point in the history
This commit fixes following warning:
net/core/net-sysfs.c:921:6: warning: symbol 'numa_node' shadows an earlier one
include/linux/topology.h:222:1: originally declared here

Signed-off-by: David Decotigny <david.decotigny@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
david decotigny authored and David S. Miller committed Nov 17, 2011
1 parent 674aee3 commit 19b05f8
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions net/core/net-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
struct xps_map *map, *new_map;
struct xps_dev_maps *dev_maps, *new_dev_maps;
int nonempty = 0;
int numa_node = -2;
int numa_node_id = -2;

if (!capable(CAP_NET_ADMIN))
return -EPERM;
Expand Down Expand Up @@ -944,10 +944,10 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
need_set = cpumask_test_cpu(cpu, mask) && cpu_online(cpu);
#ifdef CONFIG_NUMA
if (need_set) {
if (numa_node == -2)
numa_node = cpu_to_node(cpu);
else if (numa_node != cpu_to_node(cpu))
numa_node = -1;
if (numa_node_id == -2)
numa_node_id = cpu_to_node(cpu);
else if (numa_node_id != cpu_to_node(cpu))
numa_node_id = -1;
}
#endif
if (need_set && pos >= map_len) {
Expand Down Expand Up @@ -997,7 +997,7 @@ static ssize_t store_xps_map(struct netdev_queue *queue,
if (dev_maps)
kfree_rcu(dev_maps, rcu);

netdev_queue_numa_node_write(queue, (numa_node >= 0) ? numa_node :
netdev_queue_numa_node_write(queue, (numa_node_id >= 0) ? numa_node_id :
NUMA_NO_NODE);

mutex_unlock(&xps_map_mutex);
Expand Down

0 comments on commit 19b05f8

Please sign in to comment.