On Feb 1, 2008 4:37 AM, Cornelia Huck <[EMAIL PROTECTED]> wrote:
> On Thu, 31 Jan 2008 12:49:00 -0700,
> "Williams, Dan J" <[EMAIL PROTECTED]> wrote:
>
> > I am mistaken, the 'depends on ARCH...' precludes HAS_DMA. Perhaps the
> > compiler is emitting a call to async_tx_find_channel when it needs to be
> > inline? On x86 do_async_xor is successfully compiled away when
> > CONFIG_DMA_ENGINE=n.
>
> Just checked why it compiled for me on one box but not on the other and
> found that deactivating CONFIG_SECTION_MISMATCH makes it go away. Hmm...
>
Here is what I have come up with as a fix.
--
Dan
---
async_tx: prevent do_async_xor from compiling on !HAS_DMA archs
With the addition of -fno-inline in CONFIG_DEBUG_SECTION_MISMATCH
do_async_xor is no longer compiled away on !HAS_DMA archs like s390.
Other async_tx calls to the dma-api are already open coded inline.
Signed-off-by: Dan Williams <[EMAIL PROTECTED]>
---
crypto/async_tx/async_xor.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c
index 2575f67..393f07d 100644
--- a/crypto/async_tx/async_xor.c
+++ b/crypto/async_tx/async_xor.c
@@ -41,6 +41,14 @@ do_async_xor(struct dma_async_tx_descriptor *tx,
struct dma_device *device,
enum dma_data_direction dir;
int i;
+ /* if this function is not inlined we need to prevent
+ * the rest of the routine from compiling on !HAS_DMA
+ * archs
+ */
+ #ifndef CONFIG_DMA_ENGINE
+ return;
+ #endif
+
pr_debug("%s: len: %zu\n", __FUNCTION__, len);
dir = (flags & ASYNC_TX_ASSUME_COHERENT) ?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
