Commit:     d9ef8b92887c35f113cb749270530f87961f7a0a
Parent:     2b3cb2e778811a1df99e37fd7c359837501ab103
Author:     Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Wed May 9 02:33:58 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Wed May 9 12:30:51 2007 -0700

    e1000: use flush_work_keventd()
    Switch e1000 over to flush_work_keventd().  This probably fixes a 
    versus linkwatch rtnl_lock() deadlock which nobody knew about.
    (akpm: bypassed maintainers, sorry.  There are other patches which depend on
    Cc: "Maciej W. Rozycki" <[EMAIL PROTECTED]>
    Cc: David Howells <[EMAIL PROTECTED]>
    Cc: "David S. Miller" <[EMAIL PROTECTED]>
    Cc: Jeff Garzik <[EMAIL PROTECTED]>
    Acked-by: Auke Kok <[EMAIL PROTECTED]>
    Cc: Oleg Nesterov <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
 drivers/net/e1000/e1000_main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index 3a03a74..397e25b 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -1214,7 +1214,7 @@ e1000_remove(struct pci_dev *pdev)
        int i;
-       flush_scheduled_work();
+       flush_work_keventd(&adapter->reset_task);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to