]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
MIPS: malta: memory.c: Initialize the 'memsize' variable
authorMarkos Chandras <markos.chandras@imgtec.com>
Fri, 23 May 2014 12:31:31 +0000 (13:31 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Sun, 25 May 2014 10:46:24 +0000 (12:46 +0200)
If the 'memsize' environmental variable is not set by the bootloader
the 'memsize' variable is not initialized, leading to potential memory
problems. This patch fixes the problem by setting the initial
value to '0' to force the kernel to set a good default memory size.

Cc: <stable@vger.kernel.org> # v3.15+
Reported-by: Matheus Almeida <Matheus.Almeida@imgtec.com>
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: Markos Chandras <markos.chandras@imgtec.com>
Cc: stable@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/6984/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/mti-malta/malta-memory.c

index 6d0f4ab3632d01fa4b8474f3e02e388d0a1f0f89..f2364e41968282c5a5a8e3c4c954a9cb9ca8f18c 100644 (file)
@@ -27,7 +27,7 @@ unsigned long physical_memsize = 0L;
 fw_memblock_t * __init fw_getmdesc(int eva)
 {
        char *memsize_str, *ememsize_str __maybe_unused = NULL, *ptr;
-       unsigned long memsize, ememsize __maybe_unused = 0;
+       unsigned long memsize = 0, ememsize __maybe_unused = 0;
        static char cmdline[COMMAND_LINE_SIZE] __initdata;
        int tmp;