1 files changed, 26 insertions, 24 deletions

diff --git a/arch/mips/mips-boards/generic/memory.c b/arch/mips/mips-boards/generic/memory.c
index c89fcf9e9c22..be80c5dd4a0c 100644
--- a/arch/mips/mips-boards/generic/memory.c
+++ b/arch/mips/mips-boards/generic/memory.c
@@ -47,43 +47,45 @@ static char *mtypes[3] = {
 };
 #endif
 
+/* determined physical memory size, not overridden by command line args  */
+unsigned long physical_memsize = 0L;
+
 struct prom_pmemblock * __init prom_getmdesc(void)
 {
         char *memsize_str;
         unsigned int memsize;
         char cmdline[CL_SIZE], *ptr;
 
-        /* Check the command line first for a memsize directive */
-        strcpy(cmdline, arcs_cmdline);
-        ptr = strstr(cmdline, "memsize=");
-        if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
-                ptr = strstr(ptr, " memsize=");
-
-        if (ptr) {
-                memsize = memparse(ptr + 8, &ptr);
-        }
-        else {
-                /* otherwise look in the environment */
-                memsize_str = prom_getenv("memsize");
-                if (!memsize_str) {
-                        prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
-                        memsize = 0x02000000;
-                } else {
+        /* otherwise look in the environment */
+        memsize_str = prom_getenv("memsize");
+        if (!memsize_str) {
+                prom_printf("memsize not set in boot prom, set to default (32Mb)\n");
+                physical_memsize = 0x02000000;
+        } else {
 #ifdef DEBUG
-                        prom_printf("prom_memsize = %s\n", memsize_str);
+                prom_printf("prom_memsize = %s\n", memsize_str);
 #endif
-                        memsize = simple_strtol(memsize_str, NULL, 0);
-                }
+                physical_memsize = simple_strtol(memsize_str, NULL, 0);
         }
 
 #ifdef CONFIG_CPU_BIG_ENDIAN
-        /*
-         * SOC-it swaps, or perhaps doesn't swap, when DMA'ing the last
-         * word of physical memory
-         */
-        memsize -= PAGE_SIZE;
+        /* SOC-it swaps, or perhaps doesn't swap, when DMA'ing the last
+           word of physical memory */
+        physical_memsize -= PAGE_SIZE;
 #endif
 
+        /* Check the command line for a memsize directive that overrides
+           the physical/default amount */
+        strcpy(cmdline, arcs_cmdline);
+        ptr = strstr(cmdline, "memsize=");
+        if (ptr && (ptr != cmdline) && (*(ptr - 1) != ' '))
+                ptr = strstr(ptr, " memsize=");
+
+        if (ptr)
+                memsize = memparse(ptr + 8, &ptr);
+        else
+                memsize = physical_memsize;
+
         memset(mdesc, 0, sizeof(mdesc));
 
         mdesc[0].type = yamon_dontuse;