On 9/15/20 6:46 PM, Christophe Leroy wrote: > Cédric Le Goater <c...@kaod.org> a écrit : > >> and condition its call with IS_ENABLED(CONFIG_PPC32). This fixes a >> compile error with W=1. >> >> arch/powerpc/kernel/prom.c: In function ‘early_reserve_mem’: >> arch/powerpc/kernel/prom.c:625:10: error: variable ‘reserve_map’ set but not >> used [-Werror=unused-but-set-variable] >> __be64 *reserve_map; >> ^~~~~~~~~~~ >> cc1: all warnings being treated as errors >> >> Cc: Christophe Leroy <christophe.le...@c-s.fr> > > @csgroup.eu instead of @c-s.fr please > >> Signed-off-by: Cédric Le Goater <c...@kaod.org> >> --- >> arch/powerpc/kernel/prom.c | 37 ++++++++++++++++++++----------------- >> 1 file changed, 20 insertions(+), 17 deletions(-) > > That's a lot of changes for a tiny warning. > > You could make it easy by just replacing the #ifdef by: > > if (!IS_ENABLED(CONFIG_PPC32)) > return;
It's equivalent and it moves out the reserve_map variable of the main routine which I think is better. >> >> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c >> index d8a2fb87ba0c..c958b67cf1a5 100644 >> --- a/arch/powerpc/kernel/prom.c >> +++ b/arch/powerpc/kernel/prom.c >> @@ -620,27 +620,14 @@ static void __init early_reserve_mem_dt(void) >> } >> } >> >> -static void __init early_reserve_mem(void) >> +static void __init early_reserve_mem_old(void) > > Why _old ? Do you mean ppc32 are old ? Modern ADSL boxes like for instance > the famous French freebox have powerpc32 microcontroller. > Eventually you could name it _ppc32, but I don't think that's the good way, > see above. I choose old because of the comment ' ... booting from an old kexec ... ', but I agree _ppc32 might be a better choice. Thanks, C. > Christophe > >> { >> __be64 *reserve_map; >> >> reserve_map = (__be64 *)(((unsigned long)initial_boot_params) + >> fdt_off_mem_rsvmap(initial_boot_params)); >> >> - /* Look for the new "reserved-regions" property in the DT */ >> - early_reserve_mem_dt(); >> - >> -#ifdef CONFIG_BLK_DEV_INITRD >> - /* Then reserve the initrd, if any */ >> - if (initrd_start && (initrd_end > initrd_start)) { >> - memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE), >> - ALIGN(initrd_end, PAGE_SIZE) - >> - ALIGN_DOWN(initrd_start, PAGE_SIZE)); >> - } >> -#endif /* CONFIG_BLK_DEV_INITRD */ >> - >> -#ifdef CONFIG_PPC32 >> - /* >> + /* >> * Handle the case where we might be booting from an old kexec >> * image that setup the mem_rsvmap as pairs of 32-bit values >> */ >> @@ -658,9 +645,25 @@ static void __init early_reserve_mem(void) >> DBG("reserving: %x -> %x\n", base_32, size_32); >> memblock_reserve(base_32, size_32); >> } >> - return; >> } >> -#endif >> +} >> + >> +static void __init early_reserve_mem(void) >> +{ >> + /* Look for the new "reserved-regions" property in the DT */ >> + early_reserve_mem_dt(); >> + >> +#ifdef CONFIG_BLK_DEV_INITRD >> + /* Then reserve the initrd, if any */ >> + if (initrd_start && (initrd_end > initrd_start)) { >> + memblock_reserve(ALIGN_DOWN(__pa(initrd_start), PAGE_SIZE), >> + ALIGN(initrd_end, PAGE_SIZE) - >> + ALIGN_DOWN(initrd_start, PAGE_SIZE)); >> + } >> +#endif /* CONFIG_BLK_DEV_INITRD */ >> + >> + if (IS_ENABLED(CONFIG_PPC32)) >> + early_reserve_mem_old(); >> } >> >> #ifdef CONFIG_PPC_TRANSACTIONAL_MEM >> -- >> 2.25.4 > >