forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

Browse source 
* 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Remove irqsafe_cpu_xxx variants

Fix up conflict in arch/x86/include/asm/percpu.h due to clash with
cebef5beed ("x86: Fix and improve percpu_cmpxchg{8,16}b_double()")
which edited the (now removed) irqsafe_cpu_cmpxchg*_double code.
This commit is contained in:
Linus Torvalds 2012-01-09 13:08:28 -08:00
commit 6b3da11b3c
9 changed files with 62 additions and 236 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/netdevice.h
View file

@ -2155,7 +2155,7 @@ extern void netdev_run_todo(void);
*/
static inline void dev_put(struct net_device *dev)
{
irqsafe_cpu_dec(*dev->pcpu_refcnt);
this_cpu_dec(*dev->pcpu_refcnt);
}
/**
@ -2166,7 +2166,7 @@ static inline void dev_put(struct net_device *dev)
*/
static inline void dev_hold(struct net_device *dev)
{
irqsafe_cpu_inc(*dev->pcpu_refcnt);
this_cpu_inc(*dev->pcpu_refcnt);
}
/* Carrier loss detection, dial on demand. The functions netif_carrier_on