aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/dev.c4
-rw-r--r--net/iucv/iucv.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 582963077877..ee61b987f4d9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2239,7 +2239,7 @@ out:
2239 */ 2239 */
2240 if (!cpus_empty(net_dma.channel_mask)) { 2240 if (!cpus_empty(net_dma.channel_mask)) {
2241 int chan_idx; 2241 int chan_idx;
2242 for_each_cpu_mask(chan_idx, net_dma.channel_mask) { 2242 for_each_cpu_mask_nr(chan_idx, net_dma.channel_mask) {
2243 struct dma_chan *chan = net_dma.channels[chan_idx]; 2243 struct dma_chan *chan = net_dma.channels[chan_idx];
2244 if (chan) 2244 if (chan)
2245 dma_async_memcpy_issue_pending(chan); 2245 dma_async_memcpy_issue_pending(chan);
@@ -4300,7 +4300,7 @@ static void net_dma_rebalance(struct net_dma *net_dma)
4300 i = 0; 4300 i = 0;
4301 cpu = first_cpu(cpu_online_map); 4301 cpu = first_cpu(cpu_online_map);
4302 4302
4303 for_each_cpu_mask(chan_idx, net_dma->channel_mask) { 4303 for_each_cpu_mask_nr(chan_idx, net_dma->channel_mask) {
4304 chan = net_dma->channels[chan_idx]; 4304 chan = net_dma->channels[chan_idx];
4305 4305
4306 n = ((num_online_cpus() / cpus_weight(net_dma->channel_mask)) 4306 n = ((num_online_cpus() / cpus_weight(net_dma->channel_mask))
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 918970762131..8de511070593 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -497,7 +497,7 @@ static void iucv_setmask_up(void)
497 /* Disable all cpu but the first in cpu_irq_cpumask. */ 497 /* Disable all cpu but the first in cpu_irq_cpumask. */
498 cpumask = iucv_irq_cpumask; 498 cpumask = iucv_irq_cpumask;
499 cpu_clear(first_cpu(iucv_irq_cpumask), cpumask); 499 cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
500 for_each_cpu_mask(cpu, cpumask) 500 for_each_cpu_mask_nr(cpu, cpumask)
501 smp_call_function_single(cpu, iucv_block_cpu, NULL, 0, 1); 501 smp_call_function_single(cpu, iucv_block_cpu, NULL, 0, 1);
502} 502}
503 503