diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index a789a2054388..a3f7610002aa 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
@@ -1123,7 +1123,7 @@ static int alloc_percpu_mpipe_resources(struct net_device *dev, | |||
1123 | addr + i * sizeof(struct tile_net_comps); | 1123 | addr + i * sizeof(struct tile_net_comps); |
1124 | 1124 | ||
1125 | /* If this is a network cpu, create an iqueue. */ | 1125 | /* If this is a network cpu, create an iqueue. */ |
1126 | if (cpu_isset(cpu, network_cpus_map)) { | 1126 | if (cpumask_test_cpu(cpu, &network_cpus_map)) { |
1127 | order = get_order(NOTIF_RING_SIZE); | 1127 | order = get_order(NOTIF_RING_SIZE); |
1128 | page = homecache_alloc_pages(GFP_KERNEL, order, cpu); | 1128 | page = homecache_alloc_pages(GFP_KERNEL, order, cpu); |
1129 | if (page == NULL) { | 1129 | if (page == NULL) { |
@@ -1299,7 +1299,7 @@ static int tile_net_init_mpipe(struct net_device *dev) | |||
1299 | int first_ring, ring; | 1299 | int first_ring, ring; |
1300 | int instance = mpipe_instance(dev); | 1300 | int instance = mpipe_instance(dev); |
1301 | struct mpipe_data *md = &mpipe_data[instance]; | 1301 | struct mpipe_data *md = &mpipe_data[instance]; |
1302 | int network_cpus_count = cpus_weight(network_cpus_map); | 1302 | int network_cpus_count = cpumask_weight(&network_cpus_map); |
1303 | 1303 | ||
1304 | if (!hash_default) { | 1304 | if (!hash_default) { |
1305 | netdev_err(dev, "Networking requires hash_default!\n"); | 1305 | netdev_err(dev, "Networking requires hash_default!\n"); |