From ef5052182bb1a904d086f8c26e18cd718551c0af Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 25 Mar 2009 09:13:25 -0700 Subject: [PATCH] --- yaml --- r: 140281 b: refs/heads/master c: 06164f3194e01ea4c76941ac60f541d656c8975f h: refs/heads/master i: 140279: 39784a4a5fc4cd33d7b1cb825d8fae43913e2c8e v: v3 --- [refs] | 2 +- trunk/crypto/async_tx/async_xor.c | 7 ++----- trunk/include/linux/async_tx.h | 9 +++++++++ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ee0ee4201307..8e2dbd54e71c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54aee6a5f560d0e1bf3f39987c6ebe06daeb0ce1 +refs/heads/master: 06164f3194e01ea4c76941ac60f541d656c8975f diff --git a/trunk/crypto/async_tx/async_xor.c b/trunk/crypto/async_tx/async_xor.c index 595b78672b36..95fe2c8d6c51 100644 --- a/trunk/crypto/async_tx/async_xor.c +++ b/trunk/crypto/async_tx/async_xor.c @@ -30,11 +30,8 @@ #include #include -/* 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, diff --git a/trunk/include/linux/async_tx.h b/trunk/include/linux/async_tx.h index 45f6297821bd..5fc2ef8d97fa 100644 --- a/trunk/include/linux/async_tx.h +++ b/trunk/include/linux/async_tx.h @@ -21,6 +21,15 @@ #include #include +/* on architectures without dma-mapping capabilities we need to ensure + * that the asynchronous path compiles away + */ +#ifdef CONFIG_HAS_DMA +#define __async_inline +#else +#define __async_inline __always_inline +#endif + /** * dma_chan_ref - object used to manage dma channels received from the * dmaengine core.