summaryrefslogtreecommitdiffstats
path: root/arch/mips/alchemy/xxs1500/init.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 09:00:06 +0200
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 09:00:06 +0200
commit4c8440666b995f20604852b35dcfdbcc1d5931f1 (patch)
treeb3b6cd65ee275ba1adf9d2c050063f30ebbadb91 /arch/mips/alchemy/xxs1500/init.c
parentpowerpc: Remove unused/obsolete CONFIG_XICS (diff)
parentpowerpc/4xx: Fix regression in SMP on 476 (diff)
downloadlinux-4c8440666b995f20604852b35dcfdbcc1d5931f1.tar.xz
linux-4c8440666b995f20604852b35dcfdbcc1d5931f1.zip
Merge branch 'merge' into next
Diffstat (limited to 'arch/mips/alchemy/xxs1500/init.c')
-rw-r--r--arch/mips/alchemy/xxs1500/init.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/mips/alchemy/xxs1500/init.c b/arch/mips/alchemy/xxs1500/init.c
index 15125c2fda7d..34a90a4bb6f4 100644
--- a/arch/mips/alchemy/xxs1500/init.c
+++ b/arch/mips/alchemy/xxs1500/init.c
@@ -51,10 +51,9 @@ void __init prom_init(void)
prom_init_cmdline();
memsize_str = prom_getenv("memsize");
- if (!memsize_str)
+ if (!memsize_str || strict_strtoul(memsize_str, 0, &memsize))
memsize = 0x04000000;
- else
- strict_strtoul(memsize_str, 0, &memsize);
+
add_memory_region(0, memsize, BOOT_MEM_RAM);
}