PCI: kabi: fix kabi broken for struct pci_dev

hulk inclusion
category: Bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I47H3V
CVE: NA

-------------------------------------------------

Fix kabi broken introduced by the following commits:
"PCI: Add support for Immediate Readiness"
"PCI: Make link active reporting detection generic"
"PCI: Get rid of dev->has_secondary_link flag"
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
Reviewed-by: Nwangxiongfeng 00379786 <wangxiongfeng2@huawei.com>
Reviewed-by: NXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>

include/linux/pci.h

@@ -329,7 +329,6 @@ struct pci_dev {
 	pci_power_t	current_state;	/* Current operating state. In ACPI,
 					   this is D0-D3, D0 being fully
 					   functional, and D3 being off. */
-	unsigned int	imm_ready:1;	/* Supports Immediate Readiness */
 	u8		pm_cap;		/* PM capability offset */
 	unsigned int	pme_support:5;	/* Bitmask of states from which PME#
 					   can be generated */
@@ -410,9 +409,9 @@ struct pci_dev {
 	unsigned int	broken_intx_masking:1;	/* INTx masking can't be used */
 	unsigned int	io_window_1k:1;		/* Intel bridge 1K I/O windows */
 	unsigned int	irq_managed:1;
+	unsigned int	has_secondary_link:1;
 	unsigned int	non_compliant_bars:1;	/* Broken BARs; ignore them */
 	unsigned int	is_probed:1;		/* Device probing in progress */
-	unsigned int	link_active_reporting:1;/* Device capable of reporting link active */
 	pci_dev_flags_t dev_flags;
 	atomic_t	enable_cnt;	/* pci_enable_device has been called */
 
@@ -462,7 +461,17 @@ struct pci_dev {
 	unsigned long	slot_being_removed_rescanned;
 	struct pci_dev	*rpdev; /* root port pci_dev */
 
+#ifndef __GENKSYMS__
+	union {
+		struct {
+			unsigned int	imm_ready:1;	/* Supports Immediate Readiness */
+			unsigned int	link_active_reporting:1;/* Device capable of reporting link active */
+		};
+		unsigned long padding;
+	};
+#else
 	KABI_RESERVE(1)
+#endif
 	KABI_RESERVE(2)
 	KABI_RESERVE(3)
 	KABI_RESERVE(4)