> diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 70393fbb57ed..79cb6eb560a8 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -1059,4 +1059,40 @@ void iommu_debugfs_setup(void); > static inline void iommu_debugfs_setup(void) {} > #endif > > +#ifdef CONFIG_IOMMU_DMA > +#include <linux/msi.h> I don't think msi.h is actually needed here. Just make the struct msi_desc and struct msi_msg forward declarations unconditional and we should be fine.