diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:36:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 19:36:55 +0200 |
| commit | bc49e2f53089b10b60b453dfb2ecb9ee39623106 (patch) | |
| tree | 5fb67bd7eac95e24565b9a5a1bb748b8befbad64 /crypto/async_tx/async_memset.c | |
| parent | 4da3cf2ff4a51349887201dd1efa1dfbc3a99703 (diff) | |
| parent | 51f76a28b2cb2a720aaaf1e7c1139bf807595395 (diff) | |
| download | linux-crypto-bc49e2f53089b10b60b453dfb2ecb9ee39623106.tar.gz linux-crypto-bc49e2f53089b10b60b453dfb2ecb9ee39623106.zip | |
Merge branch 'x86/core' into x86/xsave
Diffstat (limited to 'crypto/async_tx/async_memset.c')
| -rw-r--r-- | crypto/async_tx/async_memset.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crypto/async_tx/async_memset.c b/crypto/async_tx/async_memset.c index f5ff3906..5b5eb99b 100644 --- a/crypto/async_tx/async_memset.c +++ b/crypto/async_tx/async_memset.c @@ -72,19 +72,11 @@ async_memset(struct page *dest, int val, unsigned int offset, dest_buf = (void *) (((char *) page_address(dest)) + offset); /* 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); - if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR) - panic("%s: DMA_ERROR waiting for depend_tx\n", - __func__); - } + async_tx_quiesce(&depend_tx); memset(dest_buf, val, len); - async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param); + async_tx_sync_epilog(cb_fn, cb_param); } return tx; |