hulk inclusion category: bugfix bugzilla: NA CVE: NA
---------------------------
fix kabi broken in struct device. It's introduced by 77e89afc25f3 ("PCI/MSI: Protect msi_desc::masked for multi-MSI").
Reviewed-by: Xiongfeng Wang wangxiongfeng2@huawei.com Reviewed-by: Xie XiuQi xiexiuqi@huawei.com Signed-off-by: Yang Yingliang yangyingliang@huawei.com --- include/linux/device.h | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/include/linux/device.h b/include/linux/device.h index 954407693ea51..44a3dd381f55c 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -1010,7 +1010,6 @@ struct device { struct dev_pin_info *pins; #endif #ifdef CONFIG_GENERIC_MSI_IRQ - raw_spinlock_t msi_lock; struct list_head msi_list; #endif
@@ -1062,7 +1061,23 @@ struct device { bool offline:1; bool of_node_reused:1;
+#ifdef CONFIG_GENERIC_MSI_IRQ +#if !defined(CONFIG_DEBUG_SPINLOCK) && !defined(CONFIG_DEBUG_LOCK_ALLOC) +#ifndef __GENKSYMS__ + union { + raw_spinlock_t msi_lock; + unsigned long kabi_reserve1; + }; +#else + KABI_RESERVE(1) +#endif +#else + raw_spinlock_t msi_lock; KABI_RESERVE(1) +#endif +#else + KABI_RESERVE(1) +#endif KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4)