[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070317015836.GC3429@sortiz.org>
Date: Sat, 17 Mar 2007 03:58:36 +0200
From: Samuel Ortiz <samuel@...tiz.org>
To: "David S. Miller" <davem@...emloft.net>
Cc: netdev@...r.kernel.org, irda-users@...ts.sourceforge.net,
Dave Jones <davej@...hat.com>
Subject: [PATCH 3/4] [net-2.6.22] IrDA: irda lockdep annotation
Rmmoding irda triggers a lockdep false positive.
Reported-by: Dave Jones <davej@...hat.com>
Signed-off-by: Samuel Ortiz <samuel@...tiz.org>
---
net/irda/irqueue.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index 9266233..d058b46 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -384,6 +384,9 @@ EXPORT_SYMBOL(hashbin_new);
* for deallocating this structure if it's complex. If not the user can
* just supply kfree, which should take care of the job.
*/
+#ifdef CONFIG_LOCKDEP
+static int hashbin_lock_depth = 0;
+#endif
int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func)
{
irda_queue_t* queue;
@@ -395,7 +398,8 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func)
/* Synchronize */
if ( hashbin->hb_type & HB_LOCK ) {
- spin_lock_irqsave(&hashbin->hb_spinlock, flags);
+ spin_lock_irqsave_nested(&hashbin->hb_spinlock, flags,
+ hashbin_lock_depth++);
}
/*
@@ -419,6 +423,9 @@ int hashbin_delete( hashbin_t* hashbin, FREE_FUNC free_func)
/* Release lock */
if ( hashbin->hb_type & HB_LOCK) {
spin_unlock_irqrestore(&hashbin->hb_spinlock, flags);
+#ifdef CONFIG_LOCKDEP
+ hashbin_lock_depth--;
+#endif
}
/*
--
1.5.0.2
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists