diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-25 18:45:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-25 18:45:33 -0800 |
| commit | 222974c6ec9d901f7ad13bbe6e505ec1f1d822d4 (patch) | |
| tree | 41a05482263e3b0b09d880ea677c068444b172fa /include | |
| parent | 78a2cbd809ef834b680f2825d3e4c16ec66f8ffa (diff) | |
| download | linux-222974c6ec9d901f7ad13bbe6e505ec1f1d822d4.tar.gz linux-222974c6ec9d901f7ad13bbe6e505ec1f1d822d4.tar.bz2 linux-222974c6ec9d901f7ad13bbe6e505ec1f1d822d4.zip | |
iommu: remove stale declaration left over by a merge conflict
The merge commit ae3325f752ef ("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 <0x7f454c46@gmail.com>
Cc: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iommu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index d6aaaec3caf4..301e97d745c1 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -841,7 +841,6 @@ static inline void iommu_iotlb_gather_init(struct iommu_iotlb_gather *gather) }; } -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); struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags); |