mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] Revert "[IRDA]: Lockdep fix."
@ 2006-11-25 15:26 Samuel Ortiz
  2006-11-25 21:09 ` David Miller
  0 siblings, 1 reply; 4+ messages in thread
From: Samuel Ortiz @ 2006-11-25 15:26 UTC (permalink / raw)
  To: Linus Torvalds, Peter Zijlstra
  Cc: irda-users, linux-kernel, Ingo Molnar, Andrey Borzenkov, Andrew Morton

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

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2006-11-25 23:02 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-11-25 15:26 [PATCH] Revert "[IRDA]: Lockdep fix." Samuel Ortiz
2006-11-25 21:09 ` David Miller
2006-11-25 21:26   ` Linus Torvalds
2006-11-25 23:02     ` David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®