From: Joerg Roedel <jroedel@suse.de>
Date: Fri, 15 Nov 2024 08:27:02 +0000 (+0100)
Subject: Merge branches 'arm/smmu', 'mediatek', 's390', 'ti/omap', 'riscv' and 'core' into... 
X-Git-Tag: v6.13-rc1~105^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae3325f752ef;p=thirdparty%2Flinux.git

Merge branches 'arm/smmu', 'mediatek', 's390', 'ti/omap', 'riscv' and 'core' into next
---

ae3325f752ef6d278fc8901c3d6bba5715481d57
diff --cc include/linux/iommu.h
index bd722f4736352,bd722f4736352,bd722f4736352,bd722f4736352,84a6ed5e803a4,bd722f4736352,8cce372a33f10..9a3215b5c1e5d
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@@@@@@@ -784,12 -784,12 -784,12 -784,12 -784,11 -784,12 -782,14 +782,14 @@@@@@@@ static inline void iommu_iotlb_gather_i
       	};
       }
       
---- --extern int bus_iommu_probe(const struct bus_type *bus);
      +extern bool iommu_present(const struct bus_type *bus);
       extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);
       extern bool iommu_group_has_isolated_msi(struct iommu_group *group);
------ extern struct iommu_domain *iommu_domain_alloc(const struct bus_type *bus);
------ struct iommu_domain *iommu_paging_domain_alloc(struct device *dev);
++++++ struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags);
++++++ static inline struct iommu_domain *iommu_paging_domain_alloc(struct device *dev)
++++++ {
++++++ 	return iommu_paging_domain_alloc_flags(dev, 0);
++++++ }
       extern void iommu_domain_free(struct iommu_domain *domain);
       extern int iommu_attach_device(struct iommu_domain *domain,
       			       struct device *dev);