* [merged mm-nonmm-stable] kho-convert-__kho_abort-to-return-void.patch removed from -mm tree
@ 2025-11-27 22:26 Andrew Morton
0 siblings, 0 replies; only message in thread
From: Andrew Morton @ 2025-11-27 22:26 UTC (permalink / raw)
To: mm-commits, rppt, pratyush, kees, graf, ebiggers, dave, coxu, bhe,
arnd, pasha.tatashin, akpm
The quilt patch titled
Subject: kho: convert __kho_abort() to return void
has been removed from the -mm tree. Its filename was
kho-convert-__kho_abort-to-return-void.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Pasha Tatashin <pasha.tatashin@soleen.com>
Subject: kho: convert __kho_abort() to return void
Date: Fri, 14 Nov 2025 13:59:51 -0500
The internal helper __kho_abort() always returns 0 and has no failure
paths. Its return value is ignored by __kho_finalize and checked
needlessly by kho_abort.
Change the return type to void to reflect that this function cannot fail,
and simplify kho_abort by removing dead error handling code.
Link: https://lkml.kernel.org/r/20251114190002.3311679-3-pasha.tatashin@soleen.com
Signed-off-by: Pasha Tatashin <pasha.tatashin@soleen.com>
Reviewed-by: Pratyush Yadav <pratyush@kernel.org>
Reviewed-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
Cc: Alexander Graf <graf@amazon.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Baoquan He <bhe@redhat.com>
Cc: Coiby Xu <coxu@redhat.com>
Cc: Dave Vasilevsky <dave@vasilevsky.ca>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Kees Cook <kees@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
kernel/liveupdate/kexec_handover.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
--- a/kernel/liveupdate/kexec_handover.c~kho-convert-__kho_abort-to-return-void
+++ a/kernel/liveupdate/kexec_handover.c
@@ -1117,20 +1117,16 @@ err_free_pages_array:
}
EXPORT_SYMBOL_GPL(kho_restore_vmalloc);
-static int __kho_abort(void)
+static void __kho_abort(void)
{
if (kho_out.preserved_mem_map) {
kho_mem_ser_free(kho_out.preserved_mem_map);
kho_out.preserved_mem_map = NULL;
}
-
- return 0;
}
int kho_abort(void)
{
- int ret = 0;
-
if (!kho_enable)
return -EOPNOTSUPP;
@@ -1138,10 +1134,7 @@ int kho_abort(void)
if (!kho_out.finalized)
return -ENOENT;
- ret = __kho_abort();
- if (ret)
- return ret;
-
+ __kho_abort();
kho_out.finalized = false;
kho_debugfs_fdt_remove(&kho_out.dbg, kho_out.fdt);
_
Patches currently in -mm which might be from pasha.tatashin@soleen.com are
liveupdate-luo_flb-introduce-file-lifecycle-bound-global-state.patch
tests-liveupdate-add-in-kernel-liveupdate-test.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-11-27 22:26 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-11-27 22:26 [merged mm-nonmm-stable] kho-convert-__kho_abort-to-return-void.patch removed from -mm tree Andrew Morton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.