lkml.org 
[lkml]   [2011]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next v5 02/10] net-sysfs: fixed minor sparse warning
    Date
    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>
    ---
    net/core/net-sysfs.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
    index c71c434..a64382f 100644
    --- a/net/core/net-sysfs.c
    +++ b/net/core/net-sysfs.c
    @@ -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;
    @@ -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) {
    @@ -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);
    --
    1.7.3.1


    \
     
     \ /
      Last update: 2011-11-16 06:25    [W:0.022 / U:31.080 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site