Commit 0108b7be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd 

Pull iommufd fixes from Jason Gunthorpe:

 - Incorrect error unwind in iommufd_device_do_replace()

 - Correct a sparse warning missing static

* tag 'for-linus-iommufd' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd:
  iommufd/selftest: Make dirty_ops static
  iommufd/device: Fix hwpt at err_unresv in iommufd_device_do_replace()
parents 521b1e7f cf1e515c

drivers/iommu/iommufd/device.c

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ iommufd_device_do_replace(struct iommufd_device *idev, 
err_unresv:

	if (hwpt_is_paging(hwpt))

		iommufd_group_remove_reserved_iova(igroup,

						   to_hwpt_paging(old_hwpt));

						   to_hwpt_paging(hwpt));

err_unlock:

	mutex_unlock(&idev->igroup->lock);

	return ERR_PTR(rc);

drivers/iommu/iommufd/selftest.c

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ static int mock_domain_read_and_clear_dirty(struct iommu_domain *domain, 
	return 0;

}



const struct iommu_dirty_ops dirty_ops = {

static const struct iommu_dirty_ops dirty_ops = {

	.set_dirty_tracking = mock_domain_set_dirty_tracking,

	.read_and_clear_dirty = mock_domain_read_and_clear_dirty,

};