diff options
| author | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2025-08-07 09:55:19 +0200 |
|---|---|---|
| committer | Bartosz Golaszewski <bartosz.golaszewski@linaro.org> | 2025-08-07 09:55:19 +0200 |
| commit | 0074281bb6316108e0cff094bd4db78ab3eee236 (patch) | |
| tree | 9b5eeb12eed9fd2a8aa329043da7f5150ceb938c /arch/x86/kernel/setup.c | |
| parent | 63c7bc53a35e785accdc2ceab8f72d94501931ab (diff) | |
| parent | 6e64f4580381e32c06ee146ca807c555b8f73e24 (diff) | |
| download | linux-next-0074281bb6316108e0cff094bd4db78ab3eee236.tar.gz linux-next-0074281bb6316108e0cff094bd4db78ab3eee236.zip | |
Merge commit '6e64f4580381e32c06ee146ca807c555b8f73e24' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0792f31961ac..1b2edd07a3e1 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -603,7 +603,7 @@ static void __init memblock_x86_reserve_range_setup_data(void) static void __init arch_reserve_crashkernel(void) { - unsigned long long crash_base, crash_size, low_size = 0; + unsigned long long crash_base, crash_size, low_size = 0, cma_size = 0; bool high = false; int ret; @@ -612,7 +612,7 @@ static void __init arch_reserve_crashkernel(void) ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(), &crash_size, &crash_base, - &low_size, &high); + &low_size, &cma_size, &high); if (ret) return; @@ -622,6 +622,7 @@ static void __init arch_reserve_crashkernel(void) } reserve_crashkernel_generic(crash_size, crash_base, low_size, high); + reserve_crashkernel_cma(cma_size); } static struct resource standard_io_resources[] = { |