diff options
| author |   Manuel Lauss <manuel.lauss@googlemail.com> | 2011-05-07 13:55:19 +0200 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2011-05-10 18:15:26 +0100 |
| commit | 780914c3cf691a75a0b7fe89f4466eeff8058165 (patch) | |
| tree | 3355c2774e065faeb98fead934afd83b0eb5ad1b /arch | |
| parent | MIPS: Invalidate old TLB mappings when updating huge page PTEs. (diff) | |
| download | linux-dev-780914c3cf691a75a0b7fe89f4466eeff8058165.tar.xz linux-dev-780914c3cf691a75a0b7fe89f4466eeff8058165.zip | |
MIPS: Alchemy: fix xxs1500 build error
This fixes:
alchemy/xxs1500/init.c: In function 'prom_init':
alchemy/xxs1500/init.c:57:17: error: ignoring return value of 'kstrtoul', declared with attribute warn_unused_result
Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/2340/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/alchemy/xxs1500/init.c | 5 |
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); } |