From: Alex Williamson <alex.williamson@redhat.com>
Date: Tue, 2 Feb 2021 16:17:48 +0000 (-0700)
Subject: Merge branch 'v5.12/vfio/next-vaddr' into v5.12/vfio/next
X-Git-Tag: v5.12-rc1~44^2~7
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=76adb20f924f8d27ed50d02cd29cadedb59fd88f;p=linux-block.git

Merge branch 'v5.12/vfio/next-vaddr' into v5.12/vfio/next
---

76adb20f924f8d27ed50d02cd29cadedb59fd88f
diff --cc drivers/vfio/vfio_iommu_type1.c
index 706b88b5d4ee,6cf1dad501d0..ec9fd95a138b
--- a/drivers/vfio/vfio_iommu_type1.c
+++ b/drivers/vfio/vfio_iommu_type1.c
@@@ -69,8 -70,9 +70,10 @@@ struct vfio_iommu 
  	struct rb_root		dma_list;
  	struct blocking_notifier_head notifier;
  	unsigned int		dma_avail;
+ 	unsigned int		vaddr_invalid_count;
  	uint64_t		pgsize_bitmap;
 +	uint64_t		num_non_pinned_groups;
+ 	wait_queue_head_t	vaddr_wait;
  	bool			v2;
  	bool			nesting;
  	bool			dirty_page_tracking;