From aafa100edcc76ab1304aeb09b55160d0ff8c47b1 Mon Sep 17 00:00:00 2001 From: Mike Travis Date: Mon, 12 May 2008 21:21:13 +0200 Subject: [PATCH] --- yaml --- r: 105207 b: refs/heads/master c: 0e12f848b337fc034ceb3c0d03d75f8de1b8cc96 h: refs/heads/master i: 105205: 8bcc7b32cf48a7b8aa518303f60fe9091b34f1f3 105203: e07b8e4b09d3eb2aac01834950961438f6a71c12 105199: 8e146b0b380b770dff85ec07bfdb79537e835351 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 4 ++-- trunk/net/iucv/iucv.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 013e8de4dc29..14aa3845a3e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d6a4360876f1e758e215570ccb04518db7cec3a +refs/heads/master: 0e12f848b337fc034ceb3c0d03d75f8de1b8cc96 diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 582963077877..ee61b987f4d9 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -2239,7 +2239,7 @@ static void net_rx_action(struct softirq_action *h) */ 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); @@ -4300,7 +4300,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/trunk/net/iucv/iucv.c b/trunk/net/iucv/iucv.c index 918970762131..8de511070593 100644 --- a/trunk/net/iucv/iucv.c +++ b/trunk/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, 0, 1); }