summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2008-02-02 18:46:43 -0700
committerDan Williams <dan.j.williams@intel.com>2008-02-06 10:12:17 -0700
commit1367a3d310afc1ce758c8b94a0dc77834b4494a0 (patch)
treecf6938c1662074f26ee16ff02d3c38332bc010ef
parent551e4fb2465b87de9d4aa1669b27d624435443bb (diff)
downloadlinux-stable-1367a3d310afc1ce758c8b94a0dc77834b4494a0.tar.gz
linux-stable-1367a3d310afc1ce758c8b94a0dc77834b4494a0.tar.bz2
linux-stable-1367a3d310afc1ce758c8b94a0dc77834b4494a0.zip
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>
-rw-r--r--crypto/async_tx/async_xor.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 2575f674dcd5..716885a87f07 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -30,7 +30,11 @@
#include <linux/raid/xor.h>
#include <linux/async_tx.h>
-static void
+/* 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 void
do_async_xor(struct dma_async_tx_descriptor *tx, struct dma_device *device,
struct dma_chan *chan, struct page *dest, struct page **src_list,
unsigned int offset, unsigned int src_cnt, size_t len,