diff options
author | Dan Williams <dan.j.williams@intel.com> | 2008-02-02 20:46:43 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2008-02-06 12:12:17 -0500 |
commit | 1367a3d310afc1ce758c8b94a0dc77834b4494a0 (patch) | |
tree | cf6938c1662074f26ee16ff02d3c38332bc010ef /crypto/async_tx | |
parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) |
async_tx: fix compile breakage, mark do_async_xor __always_inline
do_async_xor must be compiled away on !HAS_DMA archs.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'crypto/async_tx')
-rw-r--r-- | crypto/async_tx/async_xor.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 2575f674dcd..716885a87f0 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c | |||
@@ -30,7 +30,11 @@ | |||
30 | #include <linux/raid/xor.h> | 30 | #include <linux/raid/xor.h> |
31 | #include <linux/async_tx.h> | 31 | #include <linux/async_tx.h> |
32 | 32 | ||
33 | static void | 33 | /* do_async_xor - dma map the pages and perform the xor with an engine. |
34 | * This routine is marked __always_inline so it can be compiled away | ||
35 | * when CONFIG_DMA_ENGINE=n | ||
36 | */ | ||
37 | static __always_inline void | ||
34 | do_async_xor(struct dma_async_tx_descriptor *tx, struct dma_device *device, | 38 | do_async_xor(struct dma_async_tx_descriptor *tx, struct dma_device *device, |
35 | struct dma_chan *chan, struct page *dest, struct page **src_list, | 39 | struct dma_chan *chan, struct page *dest, struct page **src_list, |
36 | unsigned int offset, unsigned int src_cnt, size_t len, | 40 | unsigned int offset, unsigned int src_cnt, size_t len, |