openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] resend of 8390 patch for lockdep 

The 8390 drivers use disable_irq() as a locking primitive, which means these
uses need lockdep specific annotation that they are used as such.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Arjan van de Ven 2006-07-05 20:36:40 +02:00 committed by Jeff Garzik
parent 225ec70a8c
commit 22ad852b82
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/8390.c
View File

@ -299,7 +299,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
* Slow phase with lock held. * Slow phase with lock held.
*/ */
disable_irq_nosync(dev->irq); disable_irq_nosync_lockdep(dev->irq);
spin_lock(&ei_local->page_lock); spin_lock(&ei_local->page_lock);
@ -338,7 +338,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
outb_p(ENISR_ALL, e8390_base + EN0_IMR); outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock); spin_unlock(&ei_local->page_lock);
enable_irq(dev->irq); enable_irq_lockdep(dev->irq);
ei_local->stat.tx_errors++; ei_local->stat.tx_errors++;
return 1; return 1;
} }
@ -379,7 +379,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev)
outb_p(ENISR_ALL, e8390_base + EN0_IMR); outb_p(ENISR_ALL, e8390_base + EN0_IMR);
spin_unlock(&ei_local->page_lock); spin_unlock(&ei_local->page_lock);
enable_irq(dev->irq); enable_irq_lockdep(dev->irq);
dev_kfree_skb (skb); dev_kfree_skb (skb);
ei_local->stat.tx_bytes += send_length; ei_local->stat.tx_bytes += send_length;
@ -505,9 +505,9 @@ irqreturn_t ei_interrupt(int irq, void *dev_id, struct pt_regs * regs)
#ifdef CONFIG_NET_POLL_CONTROLLER #ifdef CONFIG_NET_POLL_CONTROLLER
void ei_poll(struct net_device *dev) void ei_poll(struct net_device *dev)
{ {
disable_irq(dev->irq); disable_irq_lockdep(dev->irq);
ei_interrupt(dev->irq, dev, NULL); ei_interrupt(dev->irq, dev, NULL);
enable_irq(dev->irq); enable_irq_lockdep(dev->irq);
} }
#endif #endif