Skip to content

Commit de53959

Browse files
committed
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()
2 parents 9bd40f8 + 92567a5 commit de53959

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

drivers/iommu/io-pgfault.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ void iommu_report_device_fault(struct device *dev, struct iopf_fault *evt)
170170
report_partial_fault(iopf_param, fault);
171171
iopf_put_dev_fault_param(iopf_param);
172172
/* A request that is not the last does not need to be ack'd */
173+
return;
173174
}
174175

175176
/*

include/linux/iommu.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -795,8 +795,6 @@ extern int iommu_attach_device(struct iommu_domain *domain,
795795
struct device *dev);
796796
extern void iommu_detach_device(struct iommu_domain *domain,
797797
struct device *dev);
798-
extern int iommu_sva_unbind_gpasid(struct iommu_domain *domain,
799-
struct device *dev, ioasid_t pasid);
800798
extern struct iommu_domain *iommu_get_domain_for_dev(struct device *dev);
801799
extern struct iommu_domain *iommu_get_dma_domain(struct device *dev);
802800
extern int iommu_map(struct iommu_domain *domain, unsigned long iova,

0 commit comments

Comments
 (0)