From 4b300d13c61907da88c5bf0987d7f113ddcc2cb0 Mon Sep 17 00:00:00 2001 From: Liangbin Lian Date: Tue, 2 Jun 2026 18:57:46 +0800 Subject: [PATCH] kernel: generic: refresh patches Signed-off-by: Liangbin Lian --- .../hack-6.6/900-module-move-kallsyms-to-the-end.patch | 8 ++++---- .../hack-6.6/900-module-move-tracing-to-the-end.patch | 6 +++--- .../generic/hack-6.6/900-sched-move-PSI-to-the-end.patch | 6 +++--- .../linux/generic/pending-6.6/835-ledtrig-sata-pmp.patch | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/target/linux/generic/hack-6.6/900-module-move-kallsyms-to-the-end.patch b/target/linux/generic/hack-6.6/900-module-move-kallsyms-to-the-end.patch index d19c4566fd..6c69d1a355 100644 --- a/target/linux/generic/hack-6.6/900-module-move-kallsyms-to-the-end.patch +++ b/target/linux/generic/hack-6.6/900-module-move-kallsyms-to-the-end.patch @@ -53,7 +53,7 @@ for better compatible #define MODULE_ARCH_INIT {} --- a/kernel/module/main.c +++ b/kernel/module/main.c -@@ -1552,6 +1552,16 @@ static void __layout_sections(struct mod +@@ -1559,6 +1559,16 @@ static void __layout_sections(struct mod if (WARN_ON_ONCE(type == MOD_INVALID)) continue; @@ -70,7 +70,7 @@ for better compatible s->sh_entsize = module_get_offset_and_type(mod, type, s, i); pr_debug("\t%s\n", sname); } -@@ -1872,11 +1882,19 @@ static int elf_validity_cache_copy(struc +@@ -1879,11 +1889,19 @@ static int elf_validity_cache_copy(struc goto no_exec; } @@ -90,7 +90,7 @@ for better compatible info->index.mod = mod_idx; -@@ -2279,11 +2297,19 @@ static int move_module(struct module *mo +@@ -2286,11 +2304,19 @@ static int move_module(struct module *mo * end up copying over all modifications made to the * userspace copy of the entire struct module. */ @@ -110,7 +110,7 @@ for better compatible memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size); } /* -@@ -2293,6 +2319,11 @@ static int move_module(struct module *mo +@@ -2300,6 +2326,11 @@ static int move_module(struct module *mo * minted official memory area. */ shdr->sh_addr = (unsigned long)dest; diff --git a/target/linux/generic/hack-6.6/900-module-move-tracing-to-the-end.patch b/target/linux/generic/hack-6.6/900-module-move-tracing-to-the-end.patch index c80c261949..aba42edac2 100644 --- a/target/linux/generic/hack-6.6/900-module-move-tracing-to-the-end.patch +++ b/target/linux/generic/hack-6.6/900-module-move-tracing-to-the-end.patch @@ -128,7 +128,7 @@ linux/sched.h: move tracing to the end of struct struct mod_kallsyms __rcu *kallsyms; --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -1405,11 +1405,6 @@ struct task_struct { +@@ -1408,11 +1408,6 @@ struct task_struct { atomic_t tracing_graph_pause; #endif @@ -140,7 +140,7 @@ linux/sched.h: move tracing to the end of struct #ifdef CONFIG_KCOV /* See kernel/kcov.c for more details. */ -@@ -1509,13 +1504,6 @@ struct task_struct { +@@ -1516,13 +1511,6 @@ struct task_struct { int mce_count; #endif @@ -154,7 +154,7 @@ linux/sched.h: move tracing to the end of struct #ifdef CONFIG_ARCH_HAS_PARANOID_L1D_FLUSH /* * If L1D flush is supported on mm context switch -@@ -1540,6 +1528,18 @@ struct task_struct { +@@ -1547,6 +1535,18 @@ struct task_struct { struct user_event_mm *user_event_mm; #endif diff --git a/target/linux/generic/hack-6.6/900-sched-move-PSI-to-the-end.patch b/target/linux/generic/hack-6.6/900-sched-move-PSI-to-the-end.patch index 6d3479dad8..08086aa15d 100644 --- a/target/linux/generic/hack-6.6/900-sched-move-PSI-to-the-end.patch +++ b/target/linux/generic/hack-6.6/900-sched-move-PSI-to-the-end.patch @@ -10,7 +10,7 @@ Signed-off-by: jjm2473 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -941,10 +941,6 @@ struct task_struct { +@@ -944,10 +944,6 @@ struct task_struct { #ifdef CONFIG_BLK_CGROUP unsigned use_memdelay:1; #endif @@ -21,7 +21,7 @@ Signed-off-by: jjm2473 #ifdef CONFIG_PAGE_OWNER /* Used by page_owner=on to detect recursion in page tracking. */ unsigned in_page_owner:1; -@@ -1204,10 +1200,6 @@ struct task_struct { +@@ -1207,10 +1203,6 @@ struct task_struct { kernel_siginfo_t *last_siginfo; struct task_io_accounting ioac; @@ -32,7 +32,7 @@ Signed-off-by: jjm2473 #ifdef CONFIG_TASK_XACCT /* Accumulated RSS usage: */ u64 acct_rss_mem1; -@@ -1528,6 +1520,13 @@ struct task_struct { +@@ -1535,6 +1527,13 @@ struct task_struct { struct user_event_mm *user_event_mm; #endif diff --git a/target/linux/generic/pending-6.6/835-ledtrig-sata-pmp.patch b/target/linux/generic/pending-6.6/835-ledtrig-sata-pmp.patch index 1e3405ecee..a97d2152bd 100644 --- a/target/linux/generic/pending-6.6/835-ledtrig-sata-pmp.patch +++ b/target/linux/generic/pending-6.6/835-ledtrig-sata-pmp.patch @@ -86,7 +86,7 @@ Subject: [PATCH] drivers/ata: sata pmp supports led trigger /** * ata_build_rw_tf - Build ATA taskfile for given read/write request * @qc: Metadata associated with the taskfile to build -@@ -3214,9 +3246,15 @@ static void sata_print_link_status(struc +@@ -3232,9 +3264,15 @@ static void sata_print_link_status(struc tmp = (sstatus >> 4) & 0xf; ata_link_info(link, "SATA link up %s (SStatus %X SControl %X)\n", sata_spd_string(tmp), sstatus, scontrol); @@ -102,7 +102,7 @@ Subject: [PATCH] drivers/ata: sata pmp supports led trigger } } -@@ -4816,6 +4854,10 @@ void __ata_qc_complete(struct ata_queued +@@ -4834,6 +4872,10 @@ void __ata_qc_complete(struct ata_queued ata_led_act(ap); #endif @@ -113,7 +113,7 @@ Subject: [PATCH] drivers/ata: sata pmp supports led trigger /* clear exclusive status */ if (unlikely(qc->flags & ATA_QCFLAG_CLEAR_EXCL && ap->excl_link == link)) -@@ -5456,6 +5498,11 @@ void ata_link_init(struct ata_port *ap, +@@ -5480,6 +5522,11 @@ void ata_link_init(struct ata_port *ap, link->active_tag = ATA_TAG_POISON; link->hw_sata_spd_limit = UINT_MAX; @@ -210,7 +210,7 @@ Subject: [PATCH] drivers/ata: sata pmp supports led trigger #define DRV_NAME "libata" #define DRV_VERSION "3.00" /* must be exactly four chars */ -@@ -236,4 +240,8 @@ static inline void zpodd_disable_run_wak +@@ -237,4 +241,8 @@ static inline void zpodd_disable_run_wak static inline void zpodd_post_poweron(struct ata_device *dev) {} #endif /* CONFIG_SATA_ZPODD */