| Message ID | f6eabbbce0fba6da3da0264c1e1cf23c01173999.1629884393.git.geert+renesas@glider.be |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | of: fdt: Rename reserve_elfcorehdr() to fdt_reserve_elfcorehdr() | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 1 warnings, 24 lines checked |
On Wed, Aug 25, 2021 at 4:40 AM Geert Uytterhoeven <geert+renesas@glider.be> wrote: > > 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); > | ^~~~~~~~~~~~~~~~~~ There's no need for the ia64 version to be non-static. Just needs a forward declaration. arch/ia64/include/asm/meminit.h:extern int reserve_elfcorehdr(u64 *start, u64 *end); arch/ia64/kernel/setup.c: if (reserve_elfcorehdr(&rsvd_region[n].start, arch/ia64/kernel/setup.c:int __init reserve_elfcorehdr(u64 *start, u64 *end) Rob
Hi Rob, On Wed, Aug 25, 2021 at 2:21 PM Rob Herring <robh+dt@kernel.org> wrote: > On Wed, Aug 25, 2021 at 4:40 AM Geert Uytterhoeven > <geert+renesas@glider.be> wrote: > > > > 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); > > | ^~~~~~~~~~~~~~~~~~ > > There's no need for the ia64 version to be non-static. Just needs a > forward declaration. > > arch/ia64/include/asm/meminit.h:extern int reserve_elfcorehdr(u64 > *start, u64 *end); > arch/ia64/kernel/setup.c: if (reserve_elfcorehdr(&rsvd_region[n].start, > arch/ia64/kernel/setup.c:int __init reserve_elfcorehdr(u64 *start, u64 *end) I know ;-) https://lore.kernel.org/r/fe236cd73b64abc4abd03dd808cb015c907f4c8c.1629884459.git.geert+renesas@glider.be/ Gr{oetje,eeting}s, Geert
On Wed, Aug 25, 2021 at 7:44 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > Hi Rob, > > On Wed, Aug 25, 2021 at 2:21 PM Rob Herring <robh+dt@kernel.org> wrote: > > On Wed, Aug 25, 2021 at 4:40 AM Geert Uytterhoeven > > <geert+renesas@glider.be> wrote: > > > > > > 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); > > > | ^~~~~~~~~~~~~~~~~~ > > > > There's no need for the ia64 version to be non-static. Just needs a > > forward declaration. > > > > arch/ia64/include/asm/meminit.h:extern int reserve_elfcorehdr(u64 > > *start, u64 *end); > > arch/ia64/kernel/setup.c: if (reserve_elfcorehdr(&rsvd_region[n].start, > > arch/ia64/kernel/setup.c:int __init reserve_elfcorehdr(u64 *start, u64 *end) > > I know ;-) > > https://lore.kernel.org/r/fe236cd73b64abc4abd03dd808cb015c907f4c8c.1629884459.git.geert+renesas@glider.be/ Ah, too much mail sorting... I guess applying this too doesn't hurt. Rob
On Wed, 25 Aug 2021 11:40:40 +0200, Geert Uytterhoeven wrote: > 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> > --- > This change was planned for v6. > Feel free to fold into the original. > --- > drivers/of/fdt.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > Applied, thanks!
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a26199022d2fc54d..4546572af24bbf14 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(); } /**
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> --- This change was planned for v6. Feel free to fold into the original. --- drivers/of/fdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)