diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 11:38:25 +0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 11:38:25 +0400 |
| commit | 48cb37bd9e053429aacb7c2726da3300aba60c68 (patch) | |
| tree | b96346400d0d36557d683bc1535ed5139f9ca76d /include/linux | |
| parent | e36fcd8ae611b91f0bbaf6063b0b98e1ef955880 (diff) | |
| parent | b71426eb10d904d421b36f51f93c8d0ba558edac (diff) | |
| download | linux-48cb37bd9e053429aacb7c2726da3300aba60c68.tar.xz | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpu.h | 6 | ||||
| -rw-r--r-- | include/linux/netdevice.h | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index 44a11f1ccaf2..8fb344a9abd8 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h @@ -48,7 +48,6 @@ static inline void unregister_cpu_notifier(struct notifier_block *nb) { } #endif -extern int current_in_cpu_hotplug(void); int cpu_up(unsigned int cpu); @@ -61,10 +60,6 @@ static inline int register_cpu_notifier(struct notifier_block *nb) static inline void unregister_cpu_notifier(struct notifier_block *nb) { } -static inline int current_in_cpu_hotplug(void) -{ - return 0; -} #endif /* CONFIG_SMP */ extern struct sysdev_class cpu_sysdev_class; @@ -73,7 +68,6 @@ extern struct sysdev_class cpu_sysdev_class; /* Stop CPUs going up and down. */ extern void lock_cpu_hotplug(void); extern void unlock_cpu_hotplug(void); -extern int lock_cpu_hotplug_interruptible(void); #define hotcpu_notifier(fn, pri) { \ static struct notifier_block fn##_nb = \ { .notifier_call = fn, .priority = pri }; \ diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 76cc099c8580..75f02d8c6ed3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -924,10 +924,10 @@ static inline void netif_tx_lock_bh(struct net_device *dev) static inline int netif_tx_trylock(struct net_device *dev) { - int err = spin_trylock(&dev->_xmit_lock); - if (!err) + int ok = spin_trylock(&dev->_xmit_lock); + if (likely(ok)) dev->xmit_lock_owner = smp_processor_id(); - return err; + return ok; } static inline void netif_tx_unlock(struct net_device *dev) |