diff --git a/Patchlist.changelog b/Patchlist.changelog index 18aba62cd..d277b293c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/e29147cd9976eb8eaf45ebc3b6e0eea59e727d1e + e29147cd9976eb8eaf45ebc3b6e0eea59e727d1e Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()" + https://gitlab.com/cki-project/kernel-ark/-/commit/f36dc0090c78cef00f283bc6f20a4b880a0ceeb5 f36dc0090c78cef00f283bc6f20a4b880a0ceeb5 x86/insn_decoder_test: allow longer symbol-names diff --git a/kernel.spec b/kernel.spec index 36b60d570..c9ace6c19 100644 --- a/kernel.spec +++ b/kernel.spec @@ -4171,6 +4171,9 @@ fi\ # # %changelog +* Mon Jan 06 2025 Justin M. Forbes [6.13.0-0.rc6.48] +- Revert "vmstat: disable vmstat_work on vmstat_cpu_down_prep()" (Linus Torvalds) + * Mon Jan 06 2025 Fedora Kernel Team [6.13.0-0.rc6.48] - x86/insn_decoder_test: allow longer symbol-names (David Rheinsberg) - kernel.spec: update license field (Scott Weaver) diff --git a/patch-6.13-redhat.patch b/patch-6.13-redhat.patch index 05df02b0b..1e61c3aee 100644 --- a/patch-6.13-redhat.patch +++ b/patch-6.13-redhat.patch @@ -77,13 +77,14 @@ kernel/rh_messages.c | 414 ++++++++++++++++ kernel/rh_messages.h | 326 +++++++++++++ kernel/rh_waived.c | 104 ++++ + mm/vmstat.c | 3 +- scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 85 files changed, 2764 insertions(+), 218 deletions(-) + 86 files changed, 2765 insertions(+), 220 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 3872bc6ec49d..b98a019b0dd0 100644 @@ -4587,6 +4588,26 @@ index 000000000000..84e22b1730cc + return 0; +} +late_initcall(__add_rh_flag); +diff --git a/mm/vmstat.c b/mm/vmstat.c +index 0889b75cef14..4d016314a56c 100644 +--- a/mm/vmstat.c ++++ b/mm/vmstat.c +@@ -2148,14 +2148,13 @@ static int vmstat_cpu_online(unsigned int cpu) + if (!node_state(cpu_to_node(cpu), N_CPU)) { + node_set_state(cpu_to_node(cpu), N_CPU); + } +- enable_delayed_work(&per_cpu(vmstat_work, cpu)); + + return 0; + } + + static int vmstat_cpu_down_prep(unsigned int cpu) + { +- disable_delayed_work_sync(&per_cpu(vmstat_work, cpu)); ++ cancel_delayed_work_sync(&per_cpu(vmstat_work, cpu)); + return 0; + } + diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 7ea59dc4926b..1cea58bf300d 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index f5b07698e..cd42ac795 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.13-rc6.tar.xz) = 2523726653c6db611ae6e30c20a50dd811820d367f42449b28a5436b0449baf04c822007ae492f6039c096fd4dd4da0e02e07697f87261bab7d0bf7bf153a3fd -SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 74ea2297c555be4ea8f1e4305cf1ffbdbee9e3d20c28a9e5d664d5e0b80dd121eebedfc20fe5f26dc633cc6da39d604562de3d77a45dd18fa6f1e8961450e0aa -SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 455f39b1bcc120243c221ab62c7614fb516dd516549fc1fe5d298125c02e4a6e44fcb4415a07ba694178354d4e53bc569b28366b3b499597b753c90c6e82f938 +SHA512 (kernel-abi-stablelists-6.13.0.tar.xz) = 630a28d1cdf64764003d80df7fd1c13b6a3d24ebc3b14a28fc0c5c342cc8c202dd14953f2306384dedb1e9a836f18f41c23018ccf0ee347e13da6a335ef498d3 +SHA512 (kernel-kabi-dw-6.13.0.tar.xz) = 102778ae43ad4247e4720795b1a101cdfa6aba28e1efc72bb38c7a89d867137e6bfbcab0cd4115f44c9c857b81d6e1f6039e5abdba088b25df380c54e5350006