diff options
| author | Ingo Molnar <mingo@kernel.org> | 2026-10-07 18:26:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2026-10-07 18:26:01 +0200 |
| commit | d1fe271c0abf3cae9a35d1c60acc16fdbee2b103 (patch) | |
| tree | d8f18b636f30f7ea93a332c83543c81a80142216 /kernel | |
| parent | 49c40d1213e1749bcfcdb07b06da9a551472d13c (diff) | |
| parent | d949fa7b1ec54c626b656f873b95d76b8ab0d143 (diff) | |
| download | linux-next-d1fe271c0abf3cae9a35d1c60acc16fdbee2b103.tar.gz linux-next-d1fe271c0abf3cae9a35d1c60acc16fdbee2b103.zip | |
Merge branch into tip/master: 'x86/kdump'
# New commits in x86/kdump:
d949fa7b1ec5 ("crash: Update stale NR_CPUS_DEFAULT references in elfcorehdr sizing docs")
6664ad1026b5 ("x86/crash: Reserve elfcorehdr for CONFIG_NR_CPUS, not CONFIG_NR_CPUS_DEFAULT")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Kconfig.kexec | 2 | ||||
| -rw-r--r-- | kernel/crash_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec index 15632358bcf7..a97ed9605602 100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@ -167,7 +167,7 @@ config CRASH_MAX_MEMORY_RANGES memory regions that the elfcorehdr buffer/segment can accommodate. These regions are obtained via walk_system_ram_res(); eg. the 'System RAM' entries in /proc/iomem. - This value is combined with NR_CPUS_DEFAULT and multiplied by + This value is combined with NR_CPUS and multiplied by sizeof(Elf64_Phdr) to determine the final elfcorehdr memory buffer/ segment size. The value 8192, for example, covers a (sparsely populated) 1TiB system diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 2b36aa9fade0..d0bd2d0cf899 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -648,7 +648,7 @@ int crash_check_hotplug_support(void) * new list of CPUs and memory. To make changes to the elfcorehdr, it * should be large enough to permit a growing number of CPU and Memory * resources. One can estimate the elfcorehdr memory size based on - * NR_CPUS_DEFAULT and CRASH_MAX_MEMORY_RANGES. The elfcorehdr is + * NR_CPUS and CRASH_MAX_MEMORY_RANGES. The elfcorehdr is * excluded from SHA verification by default if the architecture * supports crash hotplug. */ |