diff --git a/include/linux/auxvec.h b/include/linux/auxvec.h index 8bcb9b726262..58d1259157f0 100644 --- a/include/linux/auxvec.h +++ b/include/linux/auxvec.h @@ -4,6 +4,11 @@ #include -#define AT_VECTOR_SIZE_BASE 24 /* NEW_AUX_ENT entries in auxiliary table */ +#ifdef __GENKSYMS__ +#define AT_VECTOR_SIZE_BASE 22 +#else +#define AT_VECTOR_SIZE_BASE 24 +#endif +/* NEW_AUX_ENT entries in auxiliary table. */ /* number of "#define AT_.*" above, minus {AT_NULL, AT_IGNORE, AT_NOTELF} */ #endif /* _LINUX_AUXVEC_H */ diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h index f7a9c2f1b528..4a5d2c34bff7 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -3,6 +3,7 @@ #define __CPUHOTPLUG_H #include +#include /* * CPU-up CPU-down @@ -183,7 +184,7 @@ enum cpuhp_state { CPUHP_AP_QCOM_TIMER_STARTING, CPUHP_AP_TEGRA_TIMER_STARTING, CPUHP_AP_ARMADA_TIMER_STARTING, - CPUHP_AP_LOONGARCH_ARCH_TIMER_STARTING, + DEEPIN_KABI_EXTEND_ENUM(CPUHP_AP_LOONGARCH_ARCH_TIMER_STARTING) CPUHP_AP_MARCO_TIMER_STARTING, CPUHP_AP_MIPS_GIC_TIMER_STARTING, CPUHP_AP_ARC_TIMER_STARTING, diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 3b3654ee661f..d9cb534e14d7 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2803,12 +2803,22 @@ struct pcpu_sw_netstats { } __aligned(4 * sizeof(u64)); struct pcpu_dstats { - u64_stats_t rx_packets; - u64_stats_t rx_bytes; - u64_stats_t tx_packets; - u64_stats_t tx_bytes; - u64_stats_t rx_drops; - u64_stats_t tx_drops; + DEEPIN_KABI_BROKEN_REMOVE_BLOCK( + u64 rx_packets; + u64 rx_bytes; + u64 rx_drops; + u64 tx_packets; + u64 tx_bytes; + u64 tx_drops; + ) + DEEPIN_KABI_BROKEN_INSERT_BLOCK( + u64_stats_t rx_packets; + u64_stats_t rx_bytes; + u64_stats_t tx_packets; + u64_stats_t tx_bytes; + u64_stats_t rx_drops; + u64_stats_t tx_drops; + ) struct u64_stats_sync syncp; } __aligned(8 * sizeof(u64));