Messages in this thread | | | Date | Fri, 24 Nov 2006 22:14:29 +0200 | From | Samuel Ortiz <> | Subject | Re: [PATCH] lockdep: annotate irda warning |
| |
Hi guys,
On Mon, Nov 20, 2006 at 10:15:39AM +0100, Peter Zijlstra wrote: > > So, under the assumption the author was right, it just needs a lockdep > annotation. > > (depends on patches in -mm for spin_lock_irqsave_nested()) > > Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> > --- > net/irda/irlmp.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > Index: linux-2.6-mm/net/irda/irlmp.c > =================================================================== > --- linux-2.6-mm.orig/net/irda/irlmp.c 2006-11-20 09:54:50.000000000 +0100 > +++ linux-2.6-mm/net/irda/irlmp.c 2006-11-20 10:12:11.000000000 +0100 > @@ -1678,7 +1678,8 @@ static int irlmp_slsap_inuse(__u8 slsap_ > * every IrLAP connection and check every LSAP associated with each > * the connection. > */ > - spin_lock_irqsave(&irlmp->links->hb_spinlock, flags); > + spin_lock_irqsave_nested(&irlmp->links->hb_spinlock, flags, > + SINGLE_DEPTH_NESTING); > lap = (struct lap_cb *) hashbin_get_first(irlmp->links); > while (lap != NULL) { > IRDA_ASSERT(lap->magic == LMP_LAP_MAGIC, goto errlap;);
This patch got pushed into mainline, while the spin_lock_irq_save_nested() patches are not there yet. It breaks IrDA as irlmp.c doesn't build. Linus, could you please revert the corresponding commit (700f9672c9a61c12334651a94d17ec04620e1976) unless you are planning to pull the spin_lock_irq_save_nested() patches soon from -mm ? Thanks a lot in advance.
Cheers, Samuel. - 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/
| |