diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2021-08-25 11:40:40 +0200 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2021-08-25 13:13:31 -0500 |
| commit | 2fcf9a178ba1f2d4f2bf715312b84508850701d2 (patch) | |
| tree | d0ecbe07104832359ccc5bce096df2565ff5945e /drivers/of/fdt.c | |
| parent | b261dba2fdb2c2656935a048cdbc6f2d24231e08 (diff) | |
| download | lwn-2fcf9a178ba1f2d4f2bf715312b84508850701d2.tar.gz lwn-2fcf9a178ba1f2d4f2bf715312b84508850701d2.zip | |
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: f7e7ce93aac13118 ("of: fdt: Add generic support for handling elf core headers property")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/f6eabbbce0fba6da3da0264c1e1cf23c01173999.1629884393.git.geert+renesas@glider.be
Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of/fdt.c')
| -rw-r--r-- | drivers/of/fdt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a26199022d2f..4546572af24b 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -599,14 +599,14 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, } /* - * reserve_elfcorehdr() - reserves memory for elf core header + * fdt_reserve_elfcorehdr() - reserves memory for elf core header * * This function reserves the memory occupied by an elf core header * described in the device tree. This region contains all the * information about primary kernel's core image and is used by a dump * capture kernel to access the system memory on primary kernel. */ -static void __init reserve_elfcorehdr(void) +static void __init fdt_reserve_elfcorehdr(void) { if (!IS_ENABLED(CONFIG_CRASH_DUMP) || !elfcorehdr_size) return; @@ -647,7 +647,7 @@ void __init early_init_fdt_scan_reserved_mem(void) of_scan_flat_dt(__fdt_scan_reserved_mem, NULL); fdt_init_reserved_mem(); - reserve_elfcorehdr(); + fdt_reserve_elfcorehdr(); } /** |