diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:13:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-03 12:13:45 -0700 |
| commit | fc376116404063553682927e3a11edc63cfd2f7e (patch) | |
| tree | b1c749c0168bb5b187b87f850db014726ca812d9 /crypto/async_tx/async_xor.c | |
| parent | c5bc839de2485ae70d7f60a07d22da6183685e8d (diff) | |
| parent | c9d0b3fc2310d17ee1b7ef65e6cdb867c5125f12 (diff) | |
| download | linux-crypto-fc376116404063553682927e3a11edc63cfd2f7e.tar.gz linux-crypto-fc376116404063553682927e3a11edc63cfd2f7e.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dma: Add SoF and EoF debugging to ipu_idmac.c, minor cleanup
dw_dmac: add cyclic API to DW DMA driver
dmaengine: Add privatecnt to revert DMA_PRIVATE property
dmatest: add dma interrupts and callbacks
dmatest: add xor test
dmaengine: allow dma support for async_tx to be toggled
async_tx: provide __async_inline for HAS_DMA=n archs
dmaengine: kill some unused headers
dmaengine: initialize tx_list in dma_async_tx_descriptor_init
dma: i.MX31 IPU DMA robustness improvements
dma: improve section assignment in i.MX31 IPU DMA driver
dma: ipu_idmac driver cosmetic clean-up
dmaengine: fail device registration if channel registration fails
Diffstat (limited to 'crypto/async_tx/async_xor.c')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 595b7867..95fe2c8d 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -30,11 +30,8 @@ #include <linux/raid/xor.h> #include <linux/async_tx.h> -/* do_async_xor - dma map the pages and perform the xor with an engine. - * This routine is marked __always_inline so it can be compiled away - * when CONFIG_DMA_ENGINE=n - */ -static __always_inline struct dma_async_tx_descriptor * +/* do_async_xor - dma map the pages and perform the xor with an engine */ +static __async_inline struct dma_async_tx_descriptor * do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list, unsigned int offset, int src_cnt, size_t len, enum async_tx_flags flags, |