]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/prom: Fix unused variable ‘reserve_map’ when CONFIG_PPC32 is not set
authorCédric Le Goater <clg@kaod.org>
Mon, 23 Aug 2021 09:00:38 +0000 (11:00 +0200)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 23 Aug 2021 09:28:21 +0000 (19:28 +1000)
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

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210823090039.166120-2-clg@kaod.org
arch/powerpc/kernel/prom.c

index f620e04dc9bfea3c2160a44727f10cfac2796eb1..44b2cdc0aae3eaf92d9e20d9ce8ca296f9b62326 100644 (file)
@@ -640,7 +640,9 @@ static void __init early_reserve_mem(void)
        }
 #endif /* CONFIG_BLK_DEV_INITRD */
 
-#ifdef CONFIG_PPC32
+       if (!IS_ENABLED(CONFIG_PPC32))
+               return;
+
        /* 
         * Handle the case where we might be booting from an old kexec
         * image that setup the mem_rsvmap as pairs of 32-bit values
@@ -661,7 +663,6 @@ static void __init early_reserve_mem(void)
                }
                return;
        }
-#endif
 }
 
 #ifdef CONFIG_PPC_TRANSACTIONAL_MEM