From 15b0232119ca37367058315b2bf3ac43d9de1054 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Wed, 5 Jul 2006 20:36:40 +0200 Subject: [PATCH] --- yaml --- r: 35087 b: refs/heads/master c: 22ad852b8297e5063fc50f54a77e13f6d9b16a6f h: refs/heads/master i: 35085: 36568f07f28df94fdade33b044ddfdc6b3bfcae8 35083: f0708065791bc60e9543a34ebbef5a82cff5dc54 35079: d2338f63ee9eb3eca6ebc81f5c020920115b7645 35071: fd9a325d85b462bfedca5f701aad49bf6cf480a7 v: v3 --- [refs] | 2 +- trunk/drivers/net/8390.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f70eaf84b5ec..4df5406db443 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 225ec70a8cf5086a70d755e394c56186a30053d3 +refs/heads/master: 22ad852b8297e5063fc50f54a77e13f6d9b16a6f diff --git a/trunk/drivers/net/8390.c b/trunk/drivers/net/8390.c index d2935ae39814..3eb7048684a6 100644 --- a/trunk/drivers/net/8390.c +++ b/trunk/drivers/net/8390.c @@ -299,7 +299,7 @@ static int ei_start_xmit(struct sk_buff *skb, struct net_device *dev) * Slow phase with lock held. */ - disable_irq_nosync(dev->irq); + disable_irq_nosync_lockdep(dev->irq); 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); outb_p(ENISR_ALL, e8390_base + EN0_IMR); spin_unlock(&ei_local->page_lock); - enable_irq(dev->irq); + enable_irq_lockdep(dev->irq); ei_local->stat.tx_errors++; 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); spin_unlock(&ei_local->page_lock); - enable_irq(dev->irq); + enable_irq_lockdep(dev->irq); dev_kfree_skb (skb); 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 void ei_poll(struct net_device *dev) { - disable_irq(dev->irq); + disable_irq_lockdep(dev->irq); ei_interrupt(dev->irq, dev, NULL); - enable_irq(dev->irq); + enable_irq_lockdep(dev->irq); } #endif