diff options
| author | Andrew Morton <[email protected]> | 2023-12-12 17:39:11 -0800 |
|---|---|---|
| committer | Andrew Morton <[email protected]> | 2023-12-12 17:39:11 -0800 |
| commit | fc0fbad122a7609d785ee754c2b6e1e3265547d0 (patch) | |
| tree | 08bd3249feb7c54f151a99a24a08398f3eb8e9f5 /kernel | |
| parent | e52ec6a2db2e01e6a8cdfbe4fee1f89f57cdf723 (diff) | |
| parent | 4376807bf2d5371c3e00080c972be568c3f8a7d1 (diff) | |
merge mm-hotfixes-stable into mm-nonmm-stable to pick up depended-upon changes
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Kconfig.kexec | 1 | ||||
| -rw-r--r-- | kernel/crash_core.c | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/kernel/Kconfig.kexec b/kernel/Kconfig.kexec index 1cc3b1c595d7..2fd510256604 100644 --- a/kernel/Kconfig.kexec +++ b/kernel/Kconfig.kexec @@ -94,7 +94,6 @@ config KEXEC_JUMP config CRASH_DUMP bool "kernel crash dumps" depends on ARCH_SUPPORTS_CRASH_DUMP - depends on ARCH_SUPPORTS_KEXEC select CRASH_CORE select KEXEC_CORE help diff --git a/kernel/crash_core.c b/kernel/crash_core.c index efe87d501c8c..d4313b53837e 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -199,7 +199,7 @@ static __initdata char *suffix_tbl[] = { * It returns 0 on success and -EINVAL on failure. */ static int __init parse_crashkernel_suffix(char *cmdline, - unsigned long long *crash_size, + unsigned long long *crash_size, const char *suffix) { char *cur = cmdline; @@ -268,9 +268,9 @@ static int __init __parse_crashkernel(char *cmdline, unsigned long long *crash_base, const char *suffix) { - char *first_colon, *first_space; - char *ck_cmdline; - char *name = "crashkernel="; + char *first_colon, *first_space; + char *ck_cmdline; + char *name = "crashkernel="; BUG_ON(!crash_size || !crash_base); *crash_size = 0; @@ -440,7 +440,7 @@ retry: return; } - if ((crash_base > CRASH_ADDR_LOW_MAX) && + if ((crash_base >= CRASH_ADDR_LOW_MAX) && crash_low_size && reserve_crashkernel_low(crash_low_size)) { memblock_phys_free(crash_base, crash_size); return; |