lkml.org 
[lkml]   [2006]   [Nov]   [25]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
DateSat, 25 Nov 2006 17:26:49 +0200
FromSamuel Ortiz <>
Subject[PATCH] Revert "[IRDA]: Lockdep fix."
Hi Linus,

commit 700f9672c9a61c12334651a94d17ec04620e1976 breaks IrDA as irlmp.c
can no longer build. 
This is due to the spin_lock_irqsave_nested() patches being in the -mm 
tree and not yet in yours.
I'll resend the patch once both trees are synchronized.

This reverts commit 700f9672c9a61c12334651a94d17ec04620e1976.
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>

---
 net/irda/irlmp.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index fede837..5073261 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -1678,8 +1678,7 @@ #endif /* CONFIG_IRDA_ULTRA */
 	 *  every IrLAP connection and check every LSAP associated with each
 	 *  the connection.
 	 */
-	spin_lock_irqsave_nested(&irlmp->links->hb_spinlock, flags,
-			SINGLE_DEPTH_NESTING);
+	spin_lock_irqsave(&irlmp->links->hb_spinlock, flags);
 	lap = (struct lap_cb *) hashbin_get_first(irlmp->links);
 	while (lap != NULL) {
 		IRDA_ASSERT(lap->magic == LMP_LAP_MAGIC, goto errlap;);
-- 
1.4.2.3
-
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/
\
 
 \ /
  Last update: 2006-11-25 15:29    [from the cache]
©2003-2008