diff options
| author | Kevin Hickey <khickey@rmicorp.com> | 2008-07-28 20:09:26 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-30 22:54:34 +0200 |
| commit | fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc (patch) | |
| tree | 3c94f7de26bdcb0ddd73edf42a0bdb893fbe125c /arch/mips/au1000/pb1550/init.c | |
| parent | [MIPS] tlb-r4k: Nuke broken paranoia error test. (diff) | |
| download | linux-fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc.tar.xz linux-fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc.zip | |
[MIPS] Initialization of Alchemy boards
An earlier update changed some calls from simple_strotl to strict_strtol but
did not account for the differences in the syntax between the calls.
simple_strotl returns the integer; strict_strtol returns an error code and
takes a pointer to the result. As it was, NULL was being passed in place of
the result, which led to failures during kernel initialization when using
YAMON.
Signed-off-by: Kevin Hickey <khickey@rmicorp.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000/pb1550/init.c')
| -rw-r--r-- | arch/mips/au1000/pb1550/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/pb1550/init.c b/arch/mips/au1000/pb1550/init.c index 1b5f58434bb7..e1055a13a1a0 100644 --- a/arch/mips/au1000/pb1550/init.c +++ b/arch/mips/au1000/pb1550/init.c @@ -53,6 +53,6 @@ void __init prom_init(void) if (!memsize_str) memsize = 0x08000000; else - memsize = strict_strtol(memsize_str, 0, NULL); + strict_strtol(memsize_str, 0, &memsize); add_memory_region(0, memsize, BOOT_MEM_RAM); } |