diff options
author | Dan Williams <dan.j.williams@intel.com> | 2009-07-14 16:38:29 -0400 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2009-08-29 22:12:39 -0400 |
commit | 72be12f0c39df46832403cbfd82e132a883f5ddc (patch) | |
tree | 61a4014d28852692464aca3f509d2024e7006f68 | |
parent | 507fbec4cff442ebce6706db34603bfb9cc3b5a9 (diff) |
iop-adma: fix lockdep false positive
lockdep correctly identifies a potential recursive locking case for
iop_chan->lock, but in the dependency submission case we expect that the same
class will be acquired for both the parent dependency and the child channel.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r-- | drivers/dma/iop-adma.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index ce45f3fb0343..9c752bd295e1 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
@@ -288,7 +288,12 @@ static void iop_adma_tasklet(unsigned long data) | |||
288 | { | 288 | { |
289 | struct iop_adma_chan *iop_chan = (struct iop_adma_chan *) data; | 289 | struct iop_adma_chan *iop_chan = (struct iop_adma_chan *) data; |
290 | 290 | ||
291 | spin_lock(&iop_chan->lock); | 291 | /* lockdep will flag depedency submissions as potentially |
292 | * recursive locking, this is not the case as a dependency | ||
293 | * submission will never recurse a channels submit routine. | ||
294 | * There are checks in async_tx.c to prevent this. | ||
295 | */ | ||
296 | spin_lock_nested(&iop_chan->lock, SINGLE_DEPTH_NESTING); | ||
292 | __iop_adma_slot_cleanup(iop_chan); | 297 | __iop_adma_slot_cleanup(iop_chan); |
293 | spin_unlock(&iop_chan->lock); | 298 | spin_unlock(&iop_chan->lock); |
294 | } | 299 | } |