The patch titled
orinoco: fix unsafe locking in orinoco_cs_resume()
has been removed from the -mm tree. Its filename was
orinoco-fix-unsafe-locking-in-orinoco_cs_resume.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: orinoco: fix unsafe locking in orinoco_cs_resume()
From: Andrey Borzenkov <arvidjaar@xxxxxxx>
Fix a lockdep warning. Unfortunately it is rather hard to trigger on
purpose.
[ 6972.562035] =================================
[ 6972.562040] [ INFO: inconsistent lock state ]
[ 6972.562048] 2.6.27-1avb #17
[ 6972.562053] ---------------------------------
[ 6972.562060] inconsistent {in-hardirq-W} -> {hardirq-on-W} usage.
[ 6972.562068] pm-suspend/17062 [HC0[0]:SC0[0]:HE1:SE1] takes:
[ 6972.562076] (&priv->lock){++..}, at: [<dfd4f05b>] orinoco_cs_resume+0x5b/0xd0 [orinoco_cs]
[ 6972.562122] {in-hardirq-W} state was registered at:
[ 6972.562128] [<c013ea6b>] __lock_acquire+0x6cb/0x1640
[ 6972.562171] [<c013fa3c>] lock_acquire+0x5c/0x80
[ 6972.562181] [<c02f6e39>] _spin_lock_irqsave+0x49/0x80
[ 6972.562210] [<dfd6425d>] orinoco_interrupt+0x4d/0x16d0 [orinoco]
[ 6972.562257] [<c015a2b1>] handle_IRQ_event+0x31/0x60
[ 6972.562278] [<c015b73e>] handle_level_irq+0x6e/0xe0
[ 6972.562291] [<c0104b20>] do_IRQ+0xb0/0x130
[ 6972.562313] [<ffffffff>] 0xffffffff
Signed-off-by: Andrey Borzenkov <arvidjaar@xxxxxxx>
Acked-by: Dave <kilroyd@xxxxxxxxxxxxxx>
Cc: "John W. Linville" <linville@xxxxxxxxxxxxx>
Cc: Pavel Roskin <proski@xxxxxxx>
Cc: David Gibson <hermes@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/orinoco_cs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN drivers/net/wireless/orinoco_cs.c~orinoco-fix-unsafe-locking-in-orinoco_cs_resume drivers/net/wireless/orinoco_cs.c
--- a/drivers/net/wireless/orinoco_cs.c~orinoco-fix-unsafe-locking-in-orinoco_cs_resume
+++ a/drivers/net/wireless/orinoco_cs.c
@@ -378,6 +378,7 @@ static int orinoco_cs_resume(struct pcmc
struct orinoco_private *priv = netdev_priv(dev);
struct orinoco_pccard *card = priv->card;
int err = 0;
+ unsigned long flags;
if (! test_bit(0, &card->hard_reset_in_progress)) {
err = orinoco_reinit_firmware(dev);
@@ -387,7 +388,7 @@ static int orinoco_cs_resume(struct pcmc
return -EIO;
}
- spin_lock(&priv->lock);
+ spin_lock_irqsave(&priv->lock, flags);
netif_device_attach(dev);
priv->hw_unavailable--;
@@ -399,7 +400,7 @@ static int orinoco_cs_resume(struct pcmc
dev->name, err);
}
- spin_unlock(&priv->lock);
+ spin_unlock_irqrestore(&priv->lock, flags);
}
return err;
_
Patches currently in -mm which might be from arvidjaar@xxxxxxx are
origin.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
