Skip to content

Commit a9e1a3d

Browse files
Baoquan Heakpm00
authored andcommitted
crash_core: change the prototype of function parse_crashkernel()
Add two parameters 'low_size' and 'high' to function parse_crashkernel(), later crashkernel=,high|low parsing will be added. Make adjustments in all call sites of parse_crashkernel() in arch. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Baoquan He <[email protected]> Reviewed-by: Zhen Lei <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: Chen Jiahao <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent a630427 commit a9e1a3d

File tree

14 files changed

+32
-17
lines changed

14 files changed

+32
-17
lines changed

arch/arm/kernel/setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1010,7 +1010,8 @@ static void __init reserve_crashkernel(void)
10101010

10111011
total_mem = get_total_mem();
10121012
ret = parse_crashkernel(boot_command_line, total_mem,
1013-
&crash_size, &crash_base);
1013+
&crash_size, &crash_base,
1014+
NULL, NULL);
10141015
/* invalid value specified or crashkernel=0 */
10151016
if (ret || !crash_size)
10161017
return;

arch/arm64/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static void __init reserve_crashkernel(void)
142142

143143
/* crashkernel=X[@offset] */
144144
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
145-
&crash_size, &crash_base);
145+
&crash_size, &crash_base, NULL, NULL);
146146
if (ret == -ENOENT) {
147147
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);
148148
if (ret || !crash_size)

arch/ia64/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ static void __init setup_crashkernel(unsigned long total, int *n)
277277
int ret;
278278

279279
ret = parse_crashkernel(boot_command_line, total,
280-
&size, &base);
280+
&size, &base, NULL, NULL);
281281
if (ret == 0 && size > 0) {
282282
if (!base) {
283283
sort_regions(rsvd_region, *n);

arch/loongarch/kernel/setup.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,9 @@ static void __init arch_parse_crashkernel(void)
267267
unsigned long long crash_base, crash_size;
268268

269269
total_mem = memblock_phys_mem_size();
270-
ret = parse_crashkernel(boot_command_line, total_mem, &crash_size, &crash_base);
270+
ret = parse_crashkernel(boot_command_line, total_mem,
271+
&crash_size, &crash_base,
272+
NULL, NULL);
271273
if (ret < 0 || crash_size <= 0)
272274
return;
273275

arch/mips/kernel/setup.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,8 @@ static void __init mips_parse_crashkernel(void)
460460

461461
total_mem = memblock_phys_mem_size();
462462
ret = parse_crashkernel(boot_command_line, total_mem,
463-
&crash_size, &crash_base);
463+
&crash_size, &crash_base,
464+
NULL, NULL);
464465
if (ret != 0 || crash_size <= 0)
465466
return;
466467

arch/powerpc/kernel/fadump.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ static __init u64 fadump_calculate_reserve_size(void)
313313
* memory at a predefined offset.
314314
*/
315315
ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),
316-
&size, &base);
316+
&size, &base, NULL, NULL);
317317
if (ret == 0 && size > 0) {
318318
unsigned long max_size;
319319

arch/powerpc/kexec/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ void __init reserve_crashkernel(void)
109109
total_mem_sz = memory_limit ? memory_limit : memblock_phys_mem_size();
110110
/* use common parsing */
111111
ret = parse_crashkernel(boot_command_line, total_mem_sz,
112-
&crash_size, &crash_base);
112+
&crash_size, &crash_base, NULL, NULL);
113113
if (ret == 0 && crash_size > 0) {
114114
crashk_res.start = crash_base;
115115
crashk_res.end = crash_base + crash_size - 1;

arch/powerpc/mm/nohash/kaslr_booke.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ static void __init get_crash_kernel(void *fdt, unsigned long size)
178178
int ret;
179179

180180
ret = parse_crashkernel(boot_command_line, size, &crash_size,
181-
&crash_base);
181+
&crash_base, NULL, NULL);
182182
if (ret != 0 || crash_size == 0)
183183
return;
184184
if (crash_base == 0)

arch/riscv/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ static void __init reserve_crashkernel(void)
13881388
}
13891389

13901390
ret = parse_crashkernel(cmdline, memblock_phys_mem_size(),
1391-
&crash_size, &crash_base);
1391+
&crash_size, &crash_base, NULL, NULL);
13921392
if (ret == -ENOENT) {
13931393
/* Fallback to crashkernel=X,[high,low] */
13941394
ret = parse_crashkernel_high(cmdline, 0, &crash_size, &crash_base);

arch/s390/kernel/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@ static void __init reserve_crashkernel(void)
625625
phys_addr_t low, high;
626626
int rc;
627627

628-
rc = parse_crashkernel(boot_command_line, ident_map_size, &crash_size,
629-
&crash_base);
628+
rc = parse_crashkernel(boot_command_line, ident_map_size,
629+
&crash_size, &crash_base, NULL, NULL);
630630

631631
crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
632632
crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);

0 commit comments

Comments
 (0)