diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 09:25:23 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-04 00:27:09 +0200 |
| commit | e745165c6d235c03e9fa0e57984ca6fd3d3b2c50 (patch) | |
| tree | 29f859b398109d82c018d9c4ed2d9565d8c58cf9 /drivers/net/8390.c | |
| parent | [PATCH] lockdep: annotate sound/core/seq/seq_device.c (diff) | |
| download | linux-e745165c6d235c03e9fa0e57984ca6fd3d3b2c50.tar.xz linux-e745165c6d235c03e9fa0e57984ca6fd3d3b2c50.zip | |
[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>
Diffstat (limited to 'drivers/net/8390.c')
| -rw-r--r-- | drivers/net/8390.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/8390.c b/drivers/net/8390.c index 86be96af9c8f..d2935ae39814 100644 --- a/drivers/net/8390.c +++ b/drivers/net/8390.c @@ -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); } |