Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

-1
-1
include/linux/iommu.h
··· 841 841 }; 842 842 } 843 843 844 - extern bool iommu_present(const struct bus_type *bus); 845 844 extern bool device_iommu_capable(struct device *dev, enum iommu_cap cap); 846 845 extern bool iommu_group_has_isolated_msi(struct iommu_group *group); 847 846 struct iommu_domain *iommu_paging_domain_alloc_flags(struct device *dev, unsigned int flags);