The patch titled
net: fix more per-cpu typos
has been added to the -mm tree. Its filename is
net-fix-more-per-cpu-typos.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: net: fix more per-cpu typos
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/net/netdma.h | 2 +-
net/core/dev.c | 4 ++--
net/ipv4/tcp.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff -puN include/net/netdma.h~net-fix-more-per-cpu-typos include/net/netdma.h
--- a/include/net/netdma.h~net-fix-more-per-cpu-typos
+++ a/include/net/netdma.h
@@ -29,7 +29,7 @@ static inline struct dma_chan *get_softn
{
struct dma_chan *chan;
rcu_read_lock();
- chan = rcu_dereference(__get_cpu_var(softnet_data.net_dma));
+ chan = rcu_dereference(__get_cpu_var(softnet_data).net_dma);
if (chan)
dma_chan_get(chan);
rcu_read_unlock();
diff -puN net/core/dev.c~net-fix-more-per-cpu-typos net/core/dev.c
--- a/net/core/dev.c~net-fix-more-per-cpu-typos
+++ a/net/core/dev.c
@@ -3433,7 +3433,7 @@ static void net_dma_rebalance(void)
if (net_dma_count == 0) {
for_each_online_cpu(cpu)
- rcu_assign_pointer(per_cpu(softnet_data.net_dma, cpu), NULL);
+ rcu_assign_pointer(per_cpu(softnet_data, cpu).net_dma, NULL);
unlock_cpu_hotplug();
return;
}
@@ -3447,7 +3447,7 @@ static void net_dma_rebalance(void)
+ (i < (num_online_cpus() % net_dma_count) ? 1 : 0));
while(n) {
- per_cpu(softnet_data.net_dma, cpu) = chan;
+ per_cpu(softnet_data, cpu).net_dma = chan;
cpu = next_cpu(cpu, cpu_online_map);
n--;
}
diff -puN net/ipv4/tcp.c~net-fix-more-per-cpu-typos net/ipv4/tcp.c
--- a/net/ipv4/tcp.c~net-fix-more-per-cpu-typos
+++ a/net/ipv4/tcp.c
@@ -1132,7 +1132,7 @@ int tcp_recvmsg(struct kiocb *iocb, stru
tp->ucopy.dma_chan = NULL;
preempt_disable();
if ((len > sysctl_tcp_dma_copybreak) && !(flags & MSG_PEEK) &&
- !sysctl_tcp_low_latency && __get_cpu_var(softnet_data.net_dma)) {
+ !sysctl_tcp_low_latency && __get_cpu_var(softnet_data).net_dma) {
preempt_enable_no_resched();
tp->ucopy.pinned_list = dma_pin_iovec_pages(msg->msg_iov, len);
} else
_
Patches currently in -mm which might be from adobriyan@xxxxxxxxx are
megaraid-fix-warnings-when-config_proc_fs=n.patch
git-xfs.patch
headers_check-improve-include-regexp.patch
headers_check-clarify-error-message.patch
task_struct-ifdef-missedem-v-ipc.patch
ifdef-blktrace-debugging-fields.patch
x86_64-fix-more-per-cpu-typos.patch
documentation-ioctl-messtxt-start-tree-wide-ioctl-registry.patch
ioctl-messtxt-xfs-typos.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
