]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: 8719/1: NOMMU: work around maybe-uninitialized warning
authorArnd Bergmann <arnd@arndb.de>
Thu, 2 Nov 2017 12:20:31 +0000 (13:20 +0100)
committerRussell King <rmk+kernel@armlinux.org.uk>
Mon, 6 Nov 2017 11:59:19 +0000 (11:59 +0000)
The reworked MPU code produces a new warning in some configurations,
presumably starting with the code move after the compiler now makes
different inlining decisions:

arch/arm/mm/pmsa-v7.c: In function 'adjust_lowmem_bounds_mpu':
arch/arm/mm/pmsa-v7.c:310:5: error: 'specified_mem_size' may be used uninitialized in this function [-Werror=maybe-uninitialized]

This appears to be harmless, as we know that there is always at
least one memblock, and the only way this could get triggered is
if the for_each_memblock() loop was never entered.

I could not come up with a better workaround than initializing
the specified_mem_size to zero, but at least that is the value
that the variable would have in the hypothetical case of no
memblocks.

Fixes: 877ec119dbbf ("ARM: 8706/1: NOMMU: Move out MPU setup in separate module")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Vladimir Murzin <vladimir.murzin@arm.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
arch/arm/mm/pmsa-v7.c

index 106ae1c435a3252770386e2c519f53187d80dc36..976df60ac4261bb89d8053c2cd91cca3bdf0d6ed 100644 (file)
@@ -234,7 +234,7 @@ static int __init allocate_region(phys_addr_t base, phys_addr_t size,
 /* MPU initialisation functions */
 void __init adjust_lowmem_bounds_mpu(void)
 {
-       phys_addr_t  specified_mem_size, total_mem_size = 0;
+       phys_addr_t  specified_mem_size = 0, total_mem_size = 0;
        struct memblock_region *reg;
        bool first = true;
        phys_addr_t mem_start;