From d5f31fbfd8fa3836a918592032853c41d1797c3d Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Tue, 15 Jun 2010 21:44:29 -0700 Subject: netpoll: Use correct primitives for RCU dereferencing Now that RCU debugging checks for matching rcu_dereference calls and rcu_read_lock, we need to use the correct primitives or face nasty warnings. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller --- include/linux/netpoll.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/linux') diff --git a/include/linux/netpoll.h b/include/linux/netpoll.h index 4c77fe78cef..413742c92d1 100644 --- a/include/linux/netpoll.h +++ b/include/linux/netpoll.h @@ -64,7 +64,7 @@ static inline bool netpoll_rx(struct sk_buff *skb) bool ret = false; rcu_read_lock_bh(); - npinfo = rcu_dereference(skb->dev->npinfo); + npinfo = rcu_dereference_bh(skb->dev->npinfo); if (!npinfo || (list_empty(&npinfo->rx_np) && !npinfo->rx_flags)) goto out; @@ -82,7 +82,7 @@ out: static inline int netpoll_rx_on(struct sk_buff *skb) { - struct netpoll_info *npinfo = rcu_dereference(skb->dev->npinfo); + struct netpoll_info *npinfo = rcu_dereference_bh(skb->dev->npinfo); return npinfo && (!list_empty(&npinfo->rx_np) || npinfo->rx_flags); } -- cgit v1.2.3-70-g09d2