| Date | Mon, 29 May 2006 23:23:13 +0200 | From | Ingo Molnar <> | Subject | [patch 02/61] lock validator: forcedeth.c fix |
| |
From: Ingo Molnar <mingo@elte.hu>
nv_do_nic_poll() is called from timer softirqs, which has interrupts enabled, but np->lock might also be taken by some other interrupt context.
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> --- drivers/net/forcedeth.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Index: linux/drivers/net/forcedeth.c =================================================================== --- linux.orig/drivers/net/forcedeth.c +++ linux/drivers/net/forcedeth.c @@ -2869,6 +2869,7 @@ static void nv_do_nic_poll(unsigned long struct net_device *dev = (struct net_device *) data; struct fe_priv *np = netdev_priv(dev); u8 __iomem *base = get_hwbase(dev); + unsigned long flags; u32 mask = 0; /* @@ -2897,10 +2898,9 @@ static void nv_do_nic_poll(unsigned long mask |= NVREG_IRQ_OTHER; } } + local_irq_save(flags); np->nic_poll_irq = 0; - /* FIXME: Do we need synchronize_irq(dev->irq) here? */ - writel(mask, base + NvRegIrqMask); pci_push(base); @@ -2924,6 +2924,7 @@ static void nv_do_nic_poll(unsigned long enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector); } } + local_irq_restore(flags); } #ifdef CONFIG_NET_POLL_CONTROLLER - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|