From 10823ced2f18bd6779959744fb13e5974ca75a6a Mon Sep 17 00:00:00 2001 From: "Pratyush Yadav (Google)" Date: Tue, 22 Sep 2026 06:13:16 +0200 Subject: [PATCH] kho: rename kho_scratch= commandline parameter to kho_bootmem= KHO now no longer uses "scratch" to describe the memory areas passed by previous kernel. Instead, it calls them boot memory, or bootmem in short. Rename the kho_scratch= commandline parameter to reflect this terminology change. Signed-off-by: Pratyush Yadav (Google) Link: https://patch.msgid.link/20260922041321.233986-5-pratyush@kernel.org Signed-off-by: Mike Rapoport (Microsoft) --- Documentation/admin-guide/kernel-parameters.txt | 2 +- Documentation/admin-guide/mm/kho.rst | 4 ++-- kernel/liveupdate/kexec_handover.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6132fa73382a..8a42a924f133 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3031,7 +3031,7 @@ Kernel parameters "0" | "off" | "n" - kexec handover is disabled "1" | "on" | "y" - kexec handover is enabled - kho_scratch= [KEXEC,EARLY] + kho_bootmem= [KEXEC,EARLY] Format: ll[KMG],mm[KMG],nn[KMG] | nn% Defines the size of the KHO boot memory region. The diff --git a/Documentation/admin-guide/mm/kho.rst b/Documentation/admin-guide/mm/kho.rst index a6a09b693413..902d171a780a 100644 --- a/Documentation/admin-guide/mm/kho.rst +++ b/Documentation/admin-guide/mm/kho.rst @@ -20,8 +20,8 @@ need to enable if you would like to preserve their respective state across kexec. To use KHO, please boot the kernel with the ``kho=on`` command line -parameter. You may use ``kho_scratch`` parameter to define size of the -boot memory regions. For example ``kho_scratch=16M,512M,256M`` will reserve a +parameter. You may use ``kho_bootmem`` parameter to define size of the +boot memory regions. For example ``kho_bootmem=16M,512M,256M`` will reserve a 16 MiB low memory bootmem area, a 512 MiB global bootmem region, and 256 MiB per NUMA node bootmem regions on boot. diff --git a/kernel/liveupdate/kexec_handover.c b/kernel/liveupdate/kexec_handover.c index fe4b76ff5a2c..7018e25e4eda 100644 --- a/kernel/liveupdate/kexec_handover.c +++ b/kernel/liveupdate/kexec_handover.c @@ -671,12 +671,12 @@ unsigned int kho_bootmem_cnt; * The bootmem areas are scaled by default as percent of memory allocated from * memblock. A user can override the scale with command line parameter: * - * kho_scratch=N% + * kho_bootmem=N% * * It is also possible to explicitly define size for a lowmem, a global and * per-node bootmem areas: * - * kho_scratch=l[KMG],n[KMG],m[KMG] + * kho_bootmem=l[KMG],n[KMG],m[KMG] * * The explicit size definition takes precedence over scale definition. */ @@ -751,7 +751,7 @@ static int __init kho_parse_bootmem_size(char *p) return 0; } -early_param("kho_scratch", kho_parse_bootmem_size); +early_param("kho_bootmem", kho_parse_bootmem_size); static void __init bootmem_size_update(void) {