Offering: HULK hulk inclusion category: bugfix bugzilla: https://atomgit.com/src-openeuler/kernel/issues/9782 -------------------------------- Fix KABI break of struct msi_desc. Fixes: fd46ce4ab970 ("genirq/msi: Store the IOMMU IOVA directly in msi_desc instead of iommu_cookie") Signed-off-by: Lin Ruifeng <linruifeng4@huawei.com> --- include/linux/msi.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/msi.h b/include/linux/msi.h index 5ff11a37bc99..dabf7bd5350a 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -209,9 +209,13 @@ struct msi_desc { struct msi_msg msg; struct irq_affinity_desc *affinity; #ifdef CONFIG_IRQ_MSI_IOMMU +#ifdef __GENKSYMS__ + const void *iommu_cookie; +#else u64 iommu_msi_iova : 58; u64 iommu_msi_shift : 6; #endif +#endif #ifdef CONFIG_SYSFS struct device_attribute *sysfs_attrs; #endif -- 2.43.0