Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

[linux-2.6] / crypto / async_tx / async_memcpy.c

diff --git a/crypto/async_tx/async_memcpy.c b/crypto/async_tx/async_memcpy.c
index 0f6282207b3223baf9910332681fd5b3eb98295c..a5eda80e84277806b4cbb49c32d55dad233df381 100644 (file)
--- a/crypto/async_tx/async_memcpy.c
+++ b/crypto/async_tx/async_memcpy.c
@@ -66,21 +66,21 @@ async_memcpy(struct page *dest, struct page *src, unsigned int dest_offset,
        }
 
        if (tx) {
-               pr_debug("%s: (async) len: %zu\n", __FUNCTION__, len);
+               pr_debug("%s: (async) len: %zu\n", __func__, len);
                async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);
        } else {
                void *dest_buf, *src_buf;
-               pr_debug("%s: (sync) len: %zu\n", __FUNCTION__, len);
+               pr_debug("%s: (sync) len: %zu\n", __func__, len);
 
                /* wait for any prerequisite operations */
                if (depend_tx) {
                        /* if ack is already set then we cannot be sure
                         * we are referring to the correct operation
                         */
-                       BUG_ON(depend_tx->ack);
+                       BUG_ON(async_tx_test_ack(depend_tx));
                        if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
                                panic("%s: DMA_ERROR waiting for depend_tx\n",
-                                       __FUNCTION__);
+                                       __func__);
                }
 
                dest_buf = kmap_atomic(dest, KM_USER0) + dest_offset;