diff options
author | Kevin Hickey <khickey@rmicorp.com> | 2008-07-28 14:09:26 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2008-07-30 16:54:34 -0400 |
commit | fd7ccfa7ac64156a5c1c906e0986b73d481b6dfc (patch) | |
tree | 3c94f7de26bdcb0ddd73edf42a0bdb893fbe125c /arch/mips | |
parent | af6dc22b03a95c31b690f299b2fd7acb279fe7f5 (diff) |
[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')
-rw-r--r-- | arch/mips/au1000/db1x00/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/mtx-1/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1000/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1100/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1500/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/pb1550/init.c | 2 | ||||
-rw-r--r-- | arch/mips/au1000/xxs1500/init.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/au1000/db1x00/init.c b/arch/mips/au1000/db1x00/init.c index 5ebe0de5e459..847413514964 100644 --- a/arch/mips/au1000/db1x00/init.c +++ b/arch/mips/au1000/db1x00/init.c | |||
@@ -57,6 +57,6 @@ void __init prom_init(void) | |||
57 | if (!memsize_str) | 57 | if (!memsize_str) |
58 | memsize = 0x04000000; | 58 | memsize = 0x04000000; |
59 | else | 59 | else |
60 | memsize = strict_strtol(memsize_str, 0, NULL); | 60 | strict_strtol(memsize_str, 0, &memsize); |
61 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 61 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
62 | } | 62 | } |
diff --git a/arch/mips/au1000/mtx-1/init.c b/arch/mips/au1000/mtx-1/init.c index 33a4aebe0cba..3bae13c28954 100644 --- a/arch/mips/au1000/mtx-1/init.c +++ b/arch/mips/au1000/mtx-1/init.c | |||
@@ -55,6 +55,6 @@ void __init prom_init(void) | |||
55 | if (!memsize_str) | 55 | if (!memsize_str) |
56 | memsize = 0x04000000; | 56 | memsize = 0x04000000; |
57 | else | 57 | else |
58 | memsize = strict_strtol(memsize_str, 0, NULL); | 58 | strict_strtol(memsize_str, 0, &memsize); |
59 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 59 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
60 | } | 60 | } |
diff --git a/arch/mips/au1000/pb1000/init.c b/arch/mips/au1000/pb1000/init.c index 3837365d613d..8a9c7d57208d 100644 --- a/arch/mips/au1000/pb1000/init.c +++ b/arch/mips/au1000/pb1000/init.c | |||
@@ -52,6 +52,6 @@ void __init prom_init(void) | |||
52 | if (!memsize_str) | 52 | if (!memsize_str) |
53 | memsize = 0x04000000; | 53 | memsize = 0x04000000; |
54 | else | 54 | else |
55 | memsize = strict_strtol(memsize_str, 0, NULL); | 55 | strict_strtol(memsize_str, 0, &memsize); |
56 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 56 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
57 | } | 57 | } |
diff --git a/arch/mips/au1000/pb1100/init.c b/arch/mips/au1000/pb1100/init.c index 8355483f3de2..7c6792308bc5 100644 --- a/arch/mips/au1000/pb1100/init.c +++ b/arch/mips/au1000/pb1100/init.c | |||
@@ -54,7 +54,7 @@ void __init prom_init(void) | |||
54 | if (!memsize_str) | 54 | if (!memsize_str) |
55 | memsize = 0x04000000; | 55 | memsize = 0x04000000; |
56 | else | 56 | else |
57 | memsize = strict_strtol(memsize_str, 0, NULL); | 57 | strict_strtol(memsize_str, 0, &memsize); |
58 | 58 | ||
59 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 59 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
60 | } | 60 | } |
diff --git a/arch/mips/au1000/pb1200/init.c b/arch/mips/au1000/pb1200/init.c index 09fd63b86062..e9b2a0fd48ae 100644 --- a/arch/mips/au1000/pb1200/init.c +++ b/arch/mips/au1000/pb1200/init.c | |||
@@ -53,6 +53,6 @@ void __init prom_init(void) | |||
53 | if (!memsize_str) | 53 | if (!memsize_str) |
54 | memsize = 0x08000000; | 54 | memsize = 0x08000000; |
55 | else | 55 | else |
56 | memsize = strict_strtol(memsize_str, 0, NULL); | 56 | strict_strtol(memsize_str, 0, &memsize); |
57 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 57 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
58 | } | 58 | } |
diff --git a/arch/mips/au1000/pb1500/init.c b/arch/mips/au1000/pb1500/init.c index 49f51e165863..3b6e395cf952 100644 --- a/arch/mips/au1000/pb1500/init.c +++ b/arch/mips/au1000/pb1500/init.c | |||
@@ -53,6 +53,6 @@ void __init prom_init(void) | |||
53 | if (!memsize_str) | 53 | if (!memsize_str) |
54 | memsize = 0x04000000; | 54 | memsize = 0x04000000; |
55 | else | 55 | else |
56 | memsize = strict_strtol(memsize_str, 0, NULL); | 56 | strict_strtol(memsize_str, 0, &memsize); |
57 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 57 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
58 | } | 58 | } |
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) | |||
53 | if (!memsize_str) | 53 | if (!memsize_str) |
54 | memsize = 0x08000000; | 54 | memsize = 0x08000000; |
55 | else | 55 | else |
56 | memsize = strict_strtol(memsize_str, 0, NULL); | 56 | strict_strtol(memsize_str, 0, &memsize); |
57 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 57 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
58 | } | 58 | } |
diff --git a/arch/mips/au1000/xxs1500/init.c b/arch/mips/au1000/xxs1500/init.c index b849bf501c04..7516434760a1 100644 --- a/arch/mips/au1000/xxs1500/init.c +++ b/arch/mips/au1000/xxs1500/init.c | |||
@@ -53,6 +53,6 @@ void __init prom_init(void) | |||
53 | if (!memsize_str) | 53 | if (!memsize_str) |
54 | memsize = 0x04000000; | 54 | memsize = 0x04000000; |
55 | else | 55 | else |
56 | memsize = strict_strtol(memsize_str, 0, NULL); | 56 | strict_strtol(memsize_str, 0, &memsize); |
57 | add_memory_region(0, memsize, BOOT_MEM_RAM); | 57 | add_memory_region(0, memsize, BOOT_MEM_RAM); |
58 | } | 58 | } |