--- v5
+++ v4
@@ -13,36 +13,19 @@
 
 Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
 ---
- drivers/hv/vmbus_drv.c     |  4 ++++
+ drivers/hv/vmbus_drv.c     |  1 +
  drivers/scsi/storvsc_drv.c | 37 +++++++++++++++++++++----------------
  include/linux/hyperv.h     |  1 +
- 3 files changed, 26 insertions(+), 16 deletions(-)
+ 3 files changed, 23 insertions(+), 16 deletions(-)
 
 diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
-index 392c1ac4f819..ae6ec503399a 100644
+index 0a64ccfafb8b..ae6ec503399a 100644
 --- a/drivers/hv/vmbus_drv.c
 +++ b/drivers/hv/vmbus_drv.c
-@@ -33,6 +33,7 @@
- #include <linux/random.h>
- #include <linux/kernel.h>
- #include <linux/syscore_ops.h>
-+#include <linux/dma-map-ops.h>
- #include <clocksource/hyperv_timer.h>
- #include "hyperv_vmbus.h"
- 
-@@ -2078,6 +2079,7 @@ struct hv_device *vmbus_device_create(const guid_t *type,
- 	return child_device_obj;
- }
- 
-+static u64 vmbus_dma_mask = DMA_BIT_MASK(64);
- /*
-  * vmbus_device_register - Register the child device
-  */
-@@ -2118,6 +2120,8 @@ int vmbus_device_register(struct hv_device *child_device_obj)
- 	}
+@@ -2121,6 +2121,7 @@ int vmbus_device_register(struct hv_device *child_device_obj)
  	hv_debug_add_dev_dir(child_device_obj);
  
-+	child_device_obj->device.dma_mask = &vmbus_dma_mask;
+ 	child_device_obj->device.dma_mask = &vmbus_dma_mask;
 +	child_device_obj->device.dma_parms = &child_device_obj->dma_parms;
  	return 0;