diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-01-05 17:14:31 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-01-05 18:10:19 -0700 |
| commit | 07f2211e4fbce6990722d78c4f04225da9c0e9cf (patch) | |
| tree | 51934e20a334e93c8c399d2e6375f264551e9bc3 /drivers/dma/mv_xor.c | |
| parent | 28405d8d9ce05f5bd869ef8b48da5086f9527d73 (diff) | |
| download | op-kernel-dev-07f2211e4fbce6990722d78c4f04225da9c0e9cf.zip op-kernel-dev-07f2211e4fbce6990722d78c4f04225da9c0e9cf.tar.gz | |
dmaengine: remove dependency on async_tx
async_tx.ko is a consumer of dma channels. A circular dependency arises
if modules in drivers/dma rely on common code in async_tx.ko. It
prevents either module from being unloaded.
Move dma_wait_for_async_tx and async_tx_run_dependencies to dmaeninge.o
where they should have been from the beginning.
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/mv_xor.c')
| -rw-r--r-- | drivers/dma/mv_xor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index bcda174..3f46df3 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c @@ -18,7 +18,6 @@ #include <linux/init.h> #include <linux/module.h> -#include <linux/async_tx.h> #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/spinlock.h> @@ -340,7 +339,7 @@ mv_xor_run_tx_complete_actions(struct mv_xor_desc_slot *desc, } /* run dependent operations */ - async_tx_run_dependencies(&desc->async_tx); + dma_run_dependencies(&desc->async_tx); return cookie; } |
