tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by

Kevin Hickey and committed by
Ralf Baechle fd7ccfa7 af6dc22b

+8 -8
+1 -1
arch/mips/au1000/db1x00/init.c
··· 57 57 if (!memsize_str) 58 58 memsize = 0x04000000; 59 59 else 60 - memsize = strict_strtol(memsize_str, 0, NULL); 60 + strict_strtol(memsize_str, 0, &memsize); 61 61 add_memory_region(0, memsize, BOOT_MEM_RAM); 62 62 }
+1 -1
arch/mips/au1000/mtx-1/init.c
··· 55 55 if (!memsize_str) 56 56 memsize = 0x04000000; 57 57 else 58 - memsize = strict_strtol(memsize_str, 0, NULL); 58 + strict_strtol(memsize_str, 0, &memsize); 59 59 add_memory_region(0, memsize, BOOT_MEM_RAM); 60 60 }
+1 -1
arch/mips/au1000/pb1000/init.c
··· 52 52 if (!memsize_str) 53 53 memsize = 0x04000000; 54 54 else 55 - memsize = strict_strtol(memsize_str, 0, NULL); 55 + strict_strtol(memsize_str, 0, &memsize); 56 56 add_memory_region(0, memsize, BOOT_MEM_RAM); 57 57 }
+1 -1
arch/mips/au1000/pb1100/init.c
··· 54 54 if (!memsize_str) 55 55 memsize = 0x04000000; 56 56 else 57 - memsize = strict_strtol(memsize_str, 0, NULL); 57 + strict_strtol(memsize_str, 0, &memsize); 58 58 59 59 add_memory_region(0, memsize, BOOT_MEM_RAM); 60 60 }
+1 -1
arch/mips/au1000/pb1200/init.c
··· 53 53 if (!memsize_str) 54 54 memsize = 0x08000000; 55 55 else 56 - memsize = strict_strtol(memsize_str, 0, NULL); 56 + strict_strtol(memsize_str, 0, &memsize); 57 57 add_memory_region(0, memsize, BOOT_MEM_RAM); 58 58 }
+1 -1
arch/mips/au1000/pb1500/init.c
··· 53 53 if (!memsize_str) 54 54 memsize = 0x04000000; 55 55 else 56 - memsize = strict_strtol(memsize_str, 0, NULL); 56 + strict_strtol(memsize_str, 0, &memsize); 57 57 add_memory_region(0, memsize, BOOT_MEM_RAM); 58 58 }
+1 -1
arch/mips/au1000/pb1550/init.c
··· 53 53 if (!memsize_str) 54 54 memsize = 0x08000000; 55 55 else 56 - memsize = strict_strtol(memsize_str, 0, NULL); 56 + strict_strtol(memsize_str, 0, &memsize); 57 57 add_memory_region(0, memsize, BOOT_MEM_RAM); 58 58 }
+1 -1
arch/mips/au1000/xxs1500/init.c
··· 53 53 if (!memsize_str) 54 54 memsize = 0x04000000; 55 55 else 56 - memsize = strict_strtol(memsize_str, 0, NULL); 56 + strict_strtol(memsize_str, 0, &memsize); 57 57 add_memory_region(0, memsize, BOOT_MEM_RAM); 58 58 }