From: Ingo Molnar Date: Mon, 3 Jul 2006 07:25:23 +0000 (-0700) Subject: [PATCH] lockdep: annotate 8390.c disable_irq() X-Git-Tag: v2.6.18-rc1~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e745165c6d235c03e9fa0e57984ca6fd3d3b2c50;p=platform%2Fkernel%2Flinux-3.10.git [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 Cc: Arjan van de Ven Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/8390.c b/drivers/net/8390.c index 86be96a..d2935ae 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); }