diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2007-02-05 16:29:49 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-06 19:10:34 -0500 |
| commit | b7e36bfa9ffa2f6097b622ba07a95d823db553e4 (patch) | |
| tree | 7d57e7af0b9ecb3eb75b86b15e6c59bc8d6b7545 | |
| parent | 0d38ff1d3d34ca9ae2a61cf98cf47530f9d51dee (diff) | |
| download | blackbird-op-linux-b7e36bfa9ffa2f6097b622ba07a95d823db553e4.tar.gz blackbird-op-linux-b7e36bfa9ffa2f6097b622ba07a95d823db553e4.zip | |
NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
drivers/net/amd8111e.c::amd8111e_poll() contains local_irq_disable() after
local_save_flags(). Turn it into local_irq_save().
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/amd8111e.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index 18896f24d407..9c399aaefbdd 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c @@ -1334,8 +1334,7 @@ err_no_interrupt: static void amd8111e_poll(struct net_device *dev) { unsigned long flags; - local_save_flags(flags); - local_irq_disable(); + local_irq_save(flags); amd8111e_interrupt(0, dev); local_irq_restore(flags); } |
