Skip to content

Commit 222974c

Browse files
committed
iommu: remove stale declaration left over by a merge conflict
The merge commit ae3325f ("Merge branches 'arm/smmu', 'mediatek', 's390', 'ti/omap', 'riscv' and 'core' into next") left a stale declaration of 'iommu_present()' even though the 'core' branch that was merged had removed the function (and the declaration). Remove it for real. Reported-by: Dmitry Safonov <[email protected]> Cc: Joerg Roedel <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 78a2cbd commit 222974c

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

include/linux/iommu.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,6 @@ static inline void iommu_iotlb_gather_init(struct iommu_iotlb_gather *gather)
841841
};
842842
}
843843

844-
extern bool iommu_present(const struct bus_type *bus);
845844
extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap);
846845
extern bool iommu_group_has_isolated_msi(struct iommu_group *group);
847846
struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags);

0 commit comments

Comments
 (0)