replace strict_strto* call with kstrto*

[firefly-linux-kernel-4.4.55.git] / arch / tile / kernel / setup.c

diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 74c91729a62a9290e12bb31ea96ab7ad240aebc2..112ababa9e5502c6593969d44c976fbd495cf663 100644 (file)
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -228,13 +228,10 @@ early_param("isolnodes", setup_isolnodes);
 #if defined(CONFIG_PCI) && !defined(__tilegx__)
 static int __init setup_pci_reserve(char* str)
 {
-       unsigned long mb;
-
-       if (str == NULL || strict_strtoul(str, 0, &mb) != 0 ||
-           mb > 3 * 1024)
+       if (str == NULL || kstrtouint(str, 0, &pci_reserve_mb) != 0 ||
+           pci_reserve_mb > 3 * 1024)
                return -EINVAL;
 
-       pci_reserve_mb = mb;
        pr_info("Reserving %dMB for PCIE root complex mappings\n",
                pci_reserve_mb);
        return 0;
@@ -691,7 +688,7 @@ static void __init setup_bootmem_allocator(void)
        /* Reserve any memory excluded by "memmap" arguments. */
        for (i = 0; i < memmap_nr; ++i) {
                struct memmap_entry *m = &memmap_map[i];
-               reserve_bootmem(m->addr, m->size, 0);
+               reserve_bootmem(m->addr, m->size, BOOTMEM_DEFAULT);
        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
@@ -715,7 +712,8 @@ static void __init setup_bootmem_allocator(void)
 
 #ifdef CONFIG_KEXEC
        if (crashk_res.start != crashk_res.end)
-               reserve_bootmem(crashk_res.start, resource_size(&crashk_res), 0);
+               reserve_bootmem(crashk_res.start, resource_size(&crashk_res),
+                               BOOTMEM_DEFAULT);
 #endif
 }