Merge branch 'topic/raid' into for-linus

477e0f90 · Vinod Koul · 185a6cdb · 0c0eb4ca · 477e0f90
Commit 477e0f90 authored Apr 10, 2018 by Vinod Koul
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

include/linux/dmaengine.h include/linux/dmaengine.h +4 -0

No files found.
--- 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;