This is a note to let you know that I've just added the patch titled
r8169: fix sleeping while holding spinlock.
to the 2.6.36-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
r8169-fix-sleeping-while-holding-spinlock.patch
and it can be found in the queue-2.6.36 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 38ee10ad3fe93cb40985376fbf7ae0a30b48fa41 Mon Sep 17 00:00:00 2001
From: françois romieu <[email protected]>
Date: Mon, 8 Nov 2010 13:23:58 +0000
Subject: r8169: fix sleeping while holding spinlock.
From: françois romieu <[email protected]>
[ Upstream commit ea80907ff066edd1dd43c5fe90ae6677d15e6384 ]
As device_set_wakeup_enable can now sleep, move the call to outside
the critical section.
Signed-off-by: Daniel J Blueman <[email protected]>
Acked-by: Rafael J. Wysocki <[email protected]>
Acked-by: Andrew Hendry <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/r8169.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -855,10 +855,10 @@ static int rtl8169_set_wol(struct net_de
else
tp->features &= ~RTL_FEATURE_WOL;
__rtl8169_set_wol(tp, wol->wolopts);
- device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
-
spin_unlock_irq(&tp->lock);
+ device_set_wakeup_enable(&tp->pci_dev->dev, wol->wolopts);
+
return 0;
}
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.36/r8169-fix-sleeping-while-holding-spinlock.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
