[PATCH] lockdep: annotate 8390.c disable_irq()
8390.c knows that ei_local->page_lock can only be used by an irq context that it disabled - and can hence take the ->page_lock without disabling hardirqs. Teach lockdep about this. Has no effect on non-lockdep kernels. Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: Arjan van de Ven <arjan@linux.intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
933a2efc59
commit
e745165c6d
|
@ -249,7 +249,7 @@ void ei_tx_timeout(struct net_device *dev)
|
|||
|
||||
/* Ugly but a reset can be slow, yet must be protected */
|
||||
|
||||
disable_irq_nosync(dev->irq);
|
||||
disable_irq_nosync_lockdep(dev->irq);
|
||||
spin_lock(&ei_local->page_lock);
|
||||
|
||||
/* Try to restart the card. Perhaps the user has fixed something. */
|
||||
|
@ -257,7 +257,7 @@ void ei_tx_timeout(struct net_device *dev)
|
|||
NS8390_init(dev, 1);
|
||||
|
||||
spin_unlock(&ei_local->page_lock);
|
||||
enable_irq(dev->irq);
|
||||
enable_irq_lockdep(dev->irq);
|
||||
netif_wake_queue(dev);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue