3 files changed, 4 insertions, 4 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 821cb1628e5e..df5520a60b90 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2261,7 +2261,7 @@ out:
          */
         if (!cpus_empty(net_dma.channel_mask)) {
                 int chan_idx;
-                for_each_cpu_mask(chan_idx, net_dma.channel_mask) {
+                for_each_cpu_mask_nr(chan_idx, net_dma.channel_mask) {
                         struct dma_chan *chan = net_dma.channels[chan_idx];
                         if (chan)
                                 dma_async_memcpy_issue_pending(chan);
@@ -4322,7 +4322,7 @@ static void net_dma_rebalance(struct net_dma *net_dma)
         i = 0;
         cpu = first_cpu(cpu_online_map);
 
-        for_each_cpu_mask(chan_idx, net_dma->channel_mask) {
+        for_each_cpu_mask_nr(chan_idx, net_dma->channel_mask) {
                 chan = net_dma->channels[chan_idx];
 
                 n = ((num_online_cpus() / cpus_weight(net_dma->channel_mask))
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index cc34ac769a3c..411b339a0c8a 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -497,7 +497,7 @@ static void iucv_setmask_up(void)
         /* Disable all cpu but the first in cpu_irq_cpumask. */
         cpumask = iucv_irq_cpumask;
         cpu_clear(first_cpu(iucv_irq_cpumask), cpumask);
-        for_each_cpu_mask(cpu, cpumask)
+        for_each_cpu_mask_nr(cpu, cpumask)
                 smp_call_function_single(cpu, iucv_block_cpu, NULL, 1);
 }
 
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 01c7e311b904..d43cf8ddff67 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -603,7 +603,7 @@ __svc_create_thread(svc_thread_fn func, struct svc_serv *serv,
         error = kernel_thread((int (*)(void *)) func, rqstp, 0);
 
         if (have_oldmask)
-                set_cpus_allowed(current, oldmask);
+                set_cpus_allowed_ptr(current, &oldmask);
 
         if (error < 0)
                 goto out_thread;