summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCong Wang <amwang@redhat.com>2013-01-22 21:29:39 (GMT)
committerDavid S. Miller <davem@davemloft.net>2013-01-28 23:32:54 (GMT)
commit5fbee843c32e5de2d8af68ba0bdd113bb0af9d86 (patch)
tree1b5af9ab4177611b00412abe3ee3217030740307
parentce4a600e477a4da600c8056897e71e2f4a8c5ac0 (diff)
downloadlinux-5fbee843c32e5de2d8af68ba0bdd113bb0af9d86.tar.xz
netpoll: add RCU annotation to npinfo field
dev->npinfo is protected by RCU. This fixes the following sparse warnings: net/core/netpoll.c:177:48: error: incompatible types in comparison expression (different address spaces) net/core/netpoll.c:200:35: error: incompatible types in comparison expression (different address spaces) net/core/netpoll.c:221:35: error: incompatible types in comparison expression (different address spaces) net/core/netpoll.c:327:18: error: incompatible types in comparison expression (different address spaces) Cc: Eric Dumazet <eric.dumazet@gmail.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Cong Wang <amwang@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 549f5ad..85b0949 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1272,7 +1272,7 @@ struct net_device {
void (*destructor)(struct net_device *dev);
#ifdef CONFIG_NETPOLL
- struct netpoll_info *npinfo;
+ struct netpoll_info __rcu *npinfo;
#endif
#ifdef CONFIG_NET_NS