diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:54:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-26 20:54:48 -0700 |
| commit | 1e23502cc57cef33455ac7cb9111e3c6d991a894 (patch) | |
| tree | 38b21cfd31bfd7d9d987cb4d7c1e51d673a9a8e7 /drivers/net/smc91x.c | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc (diff) | |
| parent | virtio: net refill on out-of-memory (diff) | |
| download | linux-dev-1e23502cc57cef33455ac7cb9111e3c6d991a894.tar.xz linux-dev-1e23502cc57cef33455ac7cb9111e3c6d991a894.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
virtio: net refill on out-of-memory
smc91x: fix compilation on SMP
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/smc91x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 9da1fa12a67c..7567f510eff5 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c @@ -531,7 +531,7 @@ static inline void smc_rcv(struct net_device *dev) local_irq_restore(flags); \ __ret; \ }) -#define smc_special_lock(lock, flags) spin_lock_irq(lock, flags) +#define smc_special_lock(lock, flags) spin_lock_irqsave(lock, flags) #define smc_special_unlock(lock, flags) spin_unlock_irqrestore(lock, flags) #else #define smc_special_trylock(lock, flags) (1) |