tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[NET]: Fix more per-cpu typos

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Alexey Dobriyan and committed by David S. Miller 29bbd72d 95ce5688

+4 -4
unified split
+1 -1
include/net/netdma.h
··· 29 29 { 30 30 struct dma_chan *chan; 31 31 rcu_read_lock(); 32 - chan = rcu_dereference(__get_cpu_var(softnet_data.net_dma)); 32 + chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma); 33 33 if (chan) 34 34 dma_chan_get(chan); 35 35 rcu_read_unlock();
+2 -2
net/core/dev.c
··· 3421 3421 3422 3422 if (net_dma_count == 0) { 3423 3423 for_each_online_cpu(cpu) 3424 - rcu_assign_pointer(per_cpu(softnet_data.net_dma, cpu), NULL); 3424 + rcu_assign_pointer(per_cpu(softnet_data, cpu).net_dma, NULL); 3425 3425 return; 3426 3426 } 3427 3427 ··· 3434 3434 + (i < (num_online_cpus() % net_dma_count) ? 1 : 0)); 3435 3435 3436 3436 while(n) { 3437 - per_cpu(softnet_data.net_dma, cpu) = chan; 3437 + per_cpu(softnet_data, cpu).net_dma = chan; 3438 3438 cpu = next_cpu(cpu, cpu_online_map); 3439 3439 n--; 3440 3440 }
+1 -1
net/ipv4/tcp.c
··· 1132 1132 tp->ucopy.dma_chan = NULL; 1133 1133 preempt_disable(); 1134 1134 if ((len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) && 1135 - !sysctl_tcp_low_latency && __get_cpu_var(softnet_data.net_dma)) { 1135 + !sysctl_tcp_low_latency && __get_cpu_var(softnet_data).net_dma) { 1136 1136 preempt_enable_no_resched(); 1137 1137 tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len); 1138 1138 } else