diff options
| author |   Vinod Koul <vinod.koul@intel.com> | 2018-04-10 08:55:42 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2018-04-10 08:55:42 +0530 |
| commit | 477e0f90aea39d9945c7e8f9a7b33a0861015161 (patch) | |
| tree | 54c64a4cf04887a51407ee515ed91a1d0a712a08 | |
| parent | Merge branch 'topic/qcom' into for-linus (diff) | |
| parent | dmaengine: avoid map_cnt overflow with CONFIG_DMA_ENGINE_RAID (diff) | |
| download | wireguard-linux-477e0f90aea39d9945c7e8f9a7b33a0861015161.tar.xz wireguard-linux-477e0f90aea39d9945c7e8f9a7b33a0861015161.zip | |
Merge branch 'topic/raid' into for-linus
| -rw-r--r-- | include/linux/dmaengine.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index f838764993eb..861be5cab1df 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -470,7 +470,11 @@ typedef void (*dma_async_tx_callback_result)(void *dma_async_param, const struct dmaengine_result *result); struct dmaengine_unmap_data { +#if IS_ENABLED(CONFIG_DMA_ENGINE_RAID) + u16 map_cnt; +#else u8 map_cnt; +#endif u8 to_cnt; u8 from_cnt; u8 bidi_cnt; |