Commit de53959e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'iommu-fixes-v6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux 

Pull iommu fixes from Joerg Roedel:

 - Bring back a lost return statement in io-page-fault code

 - Remove an unused function declaration

* tag 'iommu-fixes-v6.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux:
  iommu: Remove unused declaration iommu_sva_unbind_gpasid()
  iommu: Restore lost return in iommu_report_device_fault()
parents 9bd40f82 92567a5f

drivers/iommu/io-pgfault.c

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ void iommu_report_device_fault(struct device *dev, struct iopf_fault *evt) 
		report_partial_fault(iopf_param, fault);

		iopf_put_dev_fault_param(iopf_param);

		/* A request that is not the last does not need to be ack'd */

		return;

	}



	/*

include/linux/iommu.h

+0 −2
Original line number Diff line number Diff line
@@ -795,8 +795,6 @@ extern int iommu_attach_device(struct iommu_domain *domain, 
			       struct device *dev);

extern void iommu_detach_device(struct iommu_domain *domain,

				struct device *dev);

extern int iommu_sva_unbind_gpasid(struct iommu_domain *domain,

				   struct device *dev, ioasid_t pasid);

extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev);

extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);

extern int iommu_map(struct iommu_domain *domain, unsigned long iova,