Skip to content

Commit a630427

Browse files
Baoquan Heakpm00
authored andcommitted
crash_core.c: remove unnecessary parameter of function
Patch series "kdump: use generic functions to simplify crashkernel reservation in arch", v3. In the current arm64, crashkernel=,high support has been finished after several rounds of posting and careful reviewing. The code in arm64 which parses crashkernel kernel parameters firstly, then reserve memory can be a good example for other ARCH to refer to. Whereas in x86_64, the code mixing crashkernel parameter parsing and memory reserving is twisted, and looks messy. Refactoring the code to make it more readable maintainable is necessary. Here, firstly abstract the crashkernel parameter parsing code into parse_crashkernel() to make it be able to parse crashkernel=,high|low. Then abstract the crashkernel memory reserving code into a generic function reserve_crashkernel_generic(). Finally, in ARCH which crashkernel=,high support is needed, a simple arch_reserve_crashkernel() can be added to call above two functions. This can remove the duplicated implmentation code in each ARCH, like arm64, x86_64 and riscv. crashkernel=512M,high crashkernel=512M,high crashkernel=256M,low crashkernel=512M,high crashkernel=0M,low crashkernel=0M,high crashkernel=256M,low crashkernel=512M crashkernel=512M@0x4f000000 crashkernel=1G-4G:256M,4G-64G:320M,64G-:576M crashkernel=0M This patch (of 9): In all call sites of __parse_crashkernel(), the parameter 'name' is hardcoded as "crashkernel=". So remove the unnecessary parameter 'name', add local varibale 'name' inside __parse_crashkernel() instead. Link: https://lkml.kernel.org/r/[email protected] 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]> Cc: Zhen Lei <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent e22c387 commit a630427

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

kernel/crash_core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,11 @@ static int __init __parse_crashkernel(char *cmdline,
248248
unsigned long long system_ram,
249249
unsigned long long *crash_size,
250250
unsigned long long *crash_base,
251-
const char *name,
252251
const char *suffix)
253252
{
254253
char *first_colon, *first_space;
255254
char *ck_cmdline;
255+
char *name = "crashkernel=";
256256

257257
BUG_ON(!crash_size || !crash_base);
258258
*crash_size = 0;
@@ -290,7 +290,7 @@ int __init parse_crashkernel(char *cmdline,
290290
unsigned long long *crash_base)
291291
{
292292
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
293-
"crashkernel=", NULL);
293+
NULL);
294294
}
295295

296296
int __init parse_crashkernel_high(char *cmdline,
@@ -299,7 +299,7 @@ int __init parse_crashkernel_high(char *cmdline,
299299
unsigned long long *crash_base)
300300
{
301301
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
302-
"crashkernel=", suffix_tbl[SUFFIX_HIGH]);
302+
suffix_tbl[SUFFIX_HIGH]);
303303
}
304304

305305
int __init parse_crashkernel_low(char *cmdline,
@@ -308,7 +308,7 @@ int __init parse_crashkernel_low(char *cmdline,
308308
unsigned long long *crash_base)
309309
{
310310
return __parse_crashkernel(cmdline, system_ram, crash_size, crash_base,
311-
"crashkernel=", suffix_tbl[SUFFIX_LOW]);
311+
suffix_tbl[SUFFIX_LOW]);
312312
}
313313

314314
/*

0 commit comments

Comments
 (0)