another .27 patch

diff --git a/queue-2.6.27/netdrvr-atl1e-don-t-take-the-mdio_lock-in-atl1e_probe.patch b/queue-2.6.27/netdrvr-atl1e-don-t-take-the-mdio_lock-in-atl1e_probe.patch
new file mode 100644 (file)
index 0000000..767faa7
--- /dev/null
+++ b/queue-2.6.27/netdrvr-atl1e-don-t-take-the-mdio_lock-in-atl1e_probe.patch
@@ -0,0 +1,42 @@
+From f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd Mon Sep 17 00:00:00 2001
+From: Matthew Wilcox <matthew@wil.cx>
+Date: Tue, 12 Aug 2008 07:13:14 -0600
+Subject: netdrvr: atl1e: Don't take the mdio_lock in atl1e_probe
+
+From: Matthew Wilcox <matthew@wil.cx>
+
+commit f382a0a8e9403c6d7f8b2cfa21e41fefb5d0c9bd upstream
+
+Lockdep warns about the mdio_lock taken with interrupts enabled then later
+taken from interrupt context.  Initially, I considered changing these
+to spin_lock_irq/spin_unlock_irq, but then I looked at atl1e_phy_init()
+and saw that it calls msleep().  Sleeping while holding a spinlock is
+not allowed either.
+
+In the probe path, we haven't registered the interrupt handler, so
+it can't poke at this card yet.  It's before we call register_netdev(),
+so I don't think any other threads can reach this card either.  If I'm
+right, we don't need a spinlock at all.
+
+Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
+Cc: Jay Cliburn <jacliburn@bellsouth.net>
+Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/net/atl1e/atl1e_main.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/drivers/net/atl1e/atl1e_main.c
++++ b/drivers/net/atl1e/atl1e_main.c
+@@ -2390,9 +2390,7 @@ static int __devinit atl1e_probe(struct 
+       }
+ 
+       /* Init GPHY as early as possible due to power saving issue  */
+-      spin_lock(&adapter->mdio_lock);
+       atl1e_phy_init(&adapter->hw);
+-      spin_unlock(&adapter->mdio_lock);
+       /* reset the controller to
+        * put the device in a known good starting state */
+       err = atl1e_reset_hw(&adapter->hw);

diff --git a/queue-2.6.27/series b/queue-2.6.27/series
index 7d736f9d811e33ff0a6eeec8212b14596a9e9583..61773f4d0062a3c6285352258162d9999820cc3e 100644 (file)
--- a/queue-2.6.27/series
+++ b/queue-2.6.27/series
@@ -11,3 +11,4 @@ x86-early_ioremap-fix-fencepost-error.patch
 x86-sb450-skip-irq0-override-if-it-is-not-routed-to-int2-of-ioapic.patch
 x86-improve-up-kernel-when-cpu-hotplug-and-smp-is-enabled.patch
 sky2-fix-wol-regression.patch
+netdrvr-atl1e-don-t-take-the-mdio_lock-in-atl1e_probe.patch