projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usb: dwc3: rockchip: fix possible circular deadlock
[firefly-linux-kernel-4.4.55.git]
/
crypto
/
async_tx
/
async_xor.c
diff --git
a/crypto/async_tx/async_xor.c
b/crypto/async_tx/async_xor.c
index e1bce26cd4f9098f2765ffbf0f8e2f00017a9219..da75777f2b3f04f09a3fc025da9e38102b2211e8 100644
(file)
--- 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)
BUG_ON(src_cnt <= 1);
if (device)
- unmap = dmaengine_get_unmap_data(device->dev, src_cnt+1, GFP_NO
IO
);
+ unmap = dmaengine_get_unmap_data(device->dev, src_cnt+1, GFP_NO
WAIT
);
if (unmap && is_dma_xor_aligned(device, offset, 0, len)) {
struct dma_async_tx_descriptor *tx;
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)
BUG_ON(src_cnt <= 1);
if (device)
- unmap = dmaengine_get_unmap_data(device->dev, src_cnt, GFP_NO
IO
);
+ unmap = dmaengine_get_unmap_data(device->dev, src_cnt, GFP_NO
WAIT
);
if (unmap && src_cnt <= device->max_xor &&
is_dma_xor_aligned(device, offset, 0, len)) {
if (unmap && src_cnt <= device->max_xor &&
is_dma_xor_aligned(device, offset, 0, len)) {