From: Li Lingfeng lilingfeng3@huawei.com
hulk inclusion category: bugfix, https://gitee.com/openeuler/kernel/issues/I7YWV4 bugzilla: 189103 CVE: NA
--------------------------------
This broken caused by adding "is_builtin". Fix kabi broken in struct Scsi_Host.
Signed-off-by: Li Lingfeng lilingfeng3@huawei.com Signed-off-by: Zhong Jinghua zhongjinghua@huawei.com --- include/scsi/scsi_host.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 7811f6c3f68c..b03b6e1d9933 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -710,9 +710,12 @@ struct Scsi_Host { */ struct device *dma_dev;
- bool is_builtin; - - KABI_RESERVE(1) + union { + bool is_builtin; + struct { + unsigned long kabi_reserved1; + }; + }; KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4)