Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e745165c authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[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: default avatarIngo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 933a2efc

drivers/net/8390.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}