aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux.com>2011-12-22 12:58:51 -0500
committerTejun Heo <tj@kernel.org>2011-12-22 13:40:20 -0500
commit933393f58fef9963eac61db8093689544e29a600 (patch)
tree719f8b231499aa4ea023bc1a06db4582df5f0965 /include/linux/netdevice.h
parentecefc36b41ac0fe92d76273a23faf27b2da13411 (diff)
percpu: Remove irqsafe_cpu_xxx variants
We simply say that regular this_cpu use must be safe regardless of preemption and interrupt state. That has no material change for x86 and s390 implementations of this_cpu operations. However, arches that do not provide their own implementation for this_cpu operations will now get code generated that disables interrupts instead of preemption. -tj: This is part of on-going percpu API cleanup. For detailed discussion of the subject, please refer to the following thread. http://thread.gmane.org/gmane.linux.kernel/1222078 Signed-off-by: Christoph Lameter <cl@linux.com> Signed-off-by: Tejun Heo <tj@kernel.org> LKML-Reference: <alpine.DEB.2.00.1112221154380.11787@router.home>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a82ad4dd306a..ca8d9bc4e502 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2115,7 +2115,7 @@ extern void netdev_run_todo(void);
2115 */ 2115 */
2116static inline void dev_put(struct net_device *dev) 2116static inline void dev_put(struct net_device *dev)
2117{ 2117{
2118 irqsafe_cpu_dec(*dev->pcpu_refcnt); 2118 this_cpu_dec(*dev->pcpu_refcnt);
2119} 2119}
2120 2120
2121/** 2121/**
@@ -2126,7 +2126,7 @@ static inline void dev_put(struct net_device *dev)
2126 */ 2126 */
2127static inline void dev_hold(struct net_device *dev) 2127static inline void dev_hold(struct net_device *dev)
2128{ 2128{
2129 irqsafe_cpu_inc(*dev->pcpu_refcnt); 2129 this_cpu_inc(*dev->pcpu_refcnt);
2130} 2130}
2131 2131
2132/* Carrier loss detection, dial on demand. The functions netif_carrier_on 2132/* Carrier loss detection, dial on demand. The functions netif_carrier_on