diff options
| author | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2016-01-21 05:16:13 +0000 |
| commit | abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937 (patch) | |
| tree | e23eae0884d78fba55a41668cf809ae3ecd61159 /crypto/async_tx/async_xor.c | |
| parent | fbac254eaaaf03131033caa87420f9af2e273907 (diff) | |
| parent | 874fbf3b2b51ca47c6a69a8e8ec5e8480c492478 (diff) | |
| download | linux-crypto-abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937.tar.gz linux-crypto-abc6a0eee5b5e3aaaf1d04260e3de3bc5d5c0937.zip | |
Merge tag 'v4.4'
Linux 4.4
Diffstat (limited to '')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index e1bce26c..da75777f 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -182,7 +182,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset, BUG_ON(src_cnt <= 1); if (device) - unmap = dmaengine_get_unmap_data(device->dev, src_cnt+1, GFP_NOIO); + unmap = dmaengine_get_unmap_data(device->dev, src_cnt+1, GFP_NOWAIT); if (unmap && is_dma_xor_aligned(device, offset, 0, len)) { struct dma_async_tx_descriptor *tx; @@ -278,7 +278,7 @@ async_xor_val(struct page *dest, struct page **src_list, unsigned int offset, BUG_ON(src_cnt <= 1); if (device) - unmap = dmaengine_get_unmap_data(device->dev, src_cnt, GFP_NOIO); + unmap = dmaengine_get_unmap_data(device->dev, src_cnt, GFP_NOWAIT); if (unmap && src_cnt <= device->max_xor && is_dma_xor_aligned(device, offset, 0, len)) { |