Skip to content

Commit 2fcf9a1

Browse files
geerturobherring
authored andcommitted
of: fdt: Rename reserve_elfcorehdr() to fdt_reserve_elfcorehdr()
On ia64/allmodconfig: drivers/of/fdt.c:609:20: error: conflicting types for 'reserve_elfcorehdr'; have 'void(void)' 609 | static void __init reserve_elfcorehdr(void) | ^~~~~~~~~~~~~~~~~~ arch/ia64/include/asm/meminit.h:43:12: note: previous declaration of 'reserve_elfcorehdr' with type 'int(u64 *, u64 *)' {aka 'int(long long unsigned int *, long long unsigned int *)'} 43 | extern int reserve_elfcorehdr(u64 *start, u64 *end); | ^~~~~~~~~~~~~~~~~~ Fix this by prefixing the FDT function name with "fdt_". Fixes: f7e7ce9 ("of: fdt: Add generic support for handling elf core headers property") Reported-by: kernel test robot <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/r/f6eabbbce0fba6da3da0264c1e1cf23c01173999.1629884393.git.geert+renesas@glider.be Signed-off-by: Rob Herring <[email protected]>
1 parent b261dba commit 2fcf9a1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/of/fdt.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -599,14 +599,14 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname,
599599
}
600600

601601
/*
602-
* reserve_elfcorehdr() - reserves memory for elf core header
602+
* fdt_reserve_elfcorehdr() - reserves memory for elf core header
603603
*
604604
* This function reserves the memory occupied by an elf core header
605605
* described in the device tree. This region contains all the
606606
* information about primary kernel's core image and is used by a dump
607607
* capture kernel to access the system memory on primary kernel.
608608
*/
609-
static void __init reserve_elfcorehdr(void)
609+
static void __init fdt_reserve_elfcorehdr(void)
610610
{
611611
if (!IS_ENABLED(CONFIG_CRASH_DUMP) || !elfcorehdr_size)
612612
return;
@@ -647,7 +647,7 @@ void __init early_init_fdt_scan_reserved_mem(void)
647647

648648
of_scan_flat_dt(__fdt_scan_reserved_mem, NULL);
649649
fdt_init_reserved_mem();
650-
reserve_elfcorehdr();
650+
fdt_reserve_elfcorehdr();
651651
}
652652

653653
/**

0 commit comments

Comments
 (0)