Skip to content

[Deepin-Kernel-SIG] [linux 6.6.y] [KABI] apply kabi fixes for 6.6.152-6.6.155 #2130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
opsiff wants to merge 3 commits into
base: linux-6.6.y
Choose a base branch
from
+24 −8
Open

[Deepin-Kernel-SIG] [linux 6.6.y] [KABI] apply kabi fixes for 6.6.152-6.6.155 #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e62592
mm: Fix kabi breakage in struct mm_struct from AT_VECTOR_SIZE_BASE
opsiff Sep 8, 2026
3e47488
cpuhotplug: Fix kabi breakage in enum cpuhp_state
opsiff Sep 8, 2026
59cc03f
net: Fix kabi breakage in struct pcpu_dstats
opsiff Sep 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion include/linux/auxvec.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@

#include <uapi/linux/auxvec.h>

#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 */
3 changes: 2 additions & 1 deletion include/linux/cpuhotplug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#define __CPUHOTPLUG_H

#include <linux/types.h>
#include <linux/deepin_kabi.h>

/*
* CPU-up CPU-down
Expand Down Expand Up @@ -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,
Expand Down
22 changes: 16 additions & 6 deletions include/linux/netdevice.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
Loading