From 6cfaa3e43e48c177c5ce96e35bb07ddb7e656635 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 14 Jul 2009 13:38:29 -0700 Subject: [PATCH] --- yaml --- r: 165821 b: refs/heads/master c: 72be12f0c39df46832403cbfd82e132a883f5ddc h: refs/heads/master i: 165819: d7c173f7d9ca9350340e2b13fc883de29e8f387e v: v3 --- [refs] | 2 +- trunk/drivers/dma/iop-adma.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e35e8e33fc18..d3a32698ef90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 507fbec4cff442ebce6706db34603bfb9cc3b5a9 +refs/heads/master: 72be12f0c39df46832403cbfd82e132a883f5ddc diff --git a/trunk/drivers/dma/iop-adma.c b/trunk/drivers/dma/iop-adma.c index ce45f3fb0343..9c752bd295e1 100644 --- a/trunk/drivers/dma/iop-adma.c +++ b/trunk/drivers/dma/iop-adma.c @@ -288,7 +288,12 @@ static void iop_adma_tasklet(unsigned long data) { struct iop_adma_chan *iop_chan = (struct iop_adma_chan *) data; - spin_lock(&iop_chan->lock); + /* lockdep will flag depedency submissions as potentially + * recursive locking, this is not the case as a dependency + * submission will never recurse a channels submit routine. + * There are checks in async_tx.c to prevent this. + */ + spin_lock_nested(&iop_chan->lock, SINGLE_DEPTH_NESTING); __iop_adma_slot_cleanup(iop_chan); spin_unlock(&iop_chan->lock); }