[PATCH RFC tip/core/rcu 08/30] net: __rcu annotations for drivers
in [Kernel]
|
Prev: [PATCH RFC tip/core/rcu 12/30] idr: __rcu annotations
Next: [PATCH RFC tip/core/rcu 10/30] notifiers: __rcu annotations
From: Paul E. McKenney on 14 Jul 2010 16:20 From: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Signed-off-by: Paul E. McKenney <paulmck(a)linux.vnet.ibm.com> Cc: "David S. Miller" <davem(a)davemloft.net> Cc: Eric Dumazet <eric.dumazet(a)gmail.com> --- drivers/net/bnx2.h | 2 +- drivers/net/bnx2x.h | 2 +- drivers/net/cnic.h | 2 +- drivers/net/macvtap.c | 2 +- include/linux/if_macvlan.h | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index ddaa3fc..ec0db55 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h @@ -6749,7 +6749,7 @@ struct bnx2 { u32 tx_wake_thresh; #ifdef BCM_CNIC - struct cnic_ops *cnic_ops; + struct cnic_ops __rcu *cnic_ops; void *cnic_data; #endif diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h index 8bd2368..b83ebd4 100644 --- a/drivers/net/bnx2x.h +++ b/drivers/net/bnx2x.h @@ -1036,7 +1036,7 @@ struct bnx2x { dma_addr_t timers_mapping; void *qm; dma_addr_t qm_mapping; - struct cnic_ops *cnic_ops; + struct cnic_ops __rcu *cnic_ops; void *cnic_data; u32 cnic_tag; struct cnic_eth_dev cnic_eth_dev; diff --git a/drivers/net/cnic.h b/drivers/net/cnic.h index 08b1235..038da24 100644 --- a/drivers/net/cnic.h +++ b/drivers/net/cnic.h @@ -177,7 +177,7 @@ struct cnic_local { #define ULP_F_INIT 0 #define ULP_F_START 1 #define ULP_F_CALL_PENDING 2 - struct cnic_ulp_ops *ulp_ops[MAX_CNIC_ULP_TYPE]; + struct cnic_ulp_ops __rcu *ulp_ops[MAX_CNIC_ULP_TYPE]; unsigned long cnic_local_flags; #define CNIC_LCL_FL_KWQ_INIT 0x0 diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index a8a94e2..aa0e0c8 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -39,7 +39,7 @@ struct macvtap_queue { struct socket sock; struct socket_wq wq; int vnet_hdr_sz; - struct macvlan_dev *vlan; + struct macvlan_dev __rcu *vlan; struct file *file; unsigned int flags; }; diff --git a/include/linux/if_macvlan.h b/include/linux/if_macvlan.h index 9ea047a..7d768bc 100644 --- a/include/linux/if_macvlan.h +++ b/include/linux/if_macvlan.h @@ -47,7 +47,7 @@ struct macvlan_dev { enum macvlan_mode mode; int (*receive)(struct sk_buff *skb); int (*forward)(struct net_device *dev, struct sk_buff *skb); - struct macvtap_queue *tap; + struct macvtap_queue __rcu *tap; }; static inline void macvlan_count_rx(const struct macvlan_dev *vlan, -- 1.7.0.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |