diff options
| author | Jarek Poplawski <jarkao2@gmail.com> | 2008-09-30 20:58:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-08 16:56:48 -0700 |
| commit | f47aeffd6089ed7a0cd18073e88cd505f188b0b7 (patch) | |
| tree | 5020fbc523db172782cc873da178f6cfd78d06d6 /drivers/net/lib8390.c | |
| parent | 23e55a32ca1ffdbe7a492ef99f0e0ac48e504a13 (diff) | |
| download | talos-obmc-linux-f47aeffd6089ed7a0cd18073e88cd505f188b0b7.tar.gz talos-obmc-linux-f47aeffd6089ed7a0cd18073e88cd505f188b0b7.zip | |
lib8390: Fix locking in ei_poll (poll controller)
This lockdep warning:
=================================
[ INFO: inconsistent lock state ]
2.6.27-rc7 #3
---------------------------------
inconsistent {in-softirq-W} -> {softirq-on-W} usage.
syslogd/2474 [HC0[0]:SC0[0]:HE1:SE1] takes:
(_xmit_ETHER#2){-+..}, at: [<c0265562>] netpoll_send_skb+0x132/0x190
...
is caused by unconditional local_irq_disable()/local_irq_enable() in
disable_irq_lockdep()/enable_irq_lockdep() used by __ei_poll(). Since
netconsole/netpoll always calls dev->poll_controller() with local irqs
disabled, disable_irq()/enable_irq() instead is safe and enough (like
e.g. in 3c509 or 8139xx drivers).
Reported-and-tested-by: Bernard Pidoux F6BVP <f6bvp@free.fr>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/lib8390.c')
| -rw-r--r-- | drivers/net/lib8390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index 00d59ab2f8ac..f80dcc11fe26 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c @@ -530,9 +530,9 @@ static irqreturn_t __ei_interrupt(int irq, void *dev_id) #ifdef CONFIG_NET_POLL_CONTROLLER static void __ei_poll(struct net_device *dev) { - disable_irq_lockdep(dev->irq); + disable_irq(dev->irq); __ei_interrupt(dev->irq, dev); - enable_irq_lockdep(dev->irq); + enable_irq(dev->irq); } #endif |
