diff options
| author | Daniel Walter <dwalter@google.com> | 2014-05-26 21:59:32 (GMT) |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2014-05-28 19:47:16 (GMT) |
| commit | b2dfa048bae3b4afe1944237c1ee9525df00bb6f (patch) | |
| tree | da24a40aece892980fad9aa2d4aec3aff9e61377 /arch | |
| parent | ba159fd387a4d47bb41ddc3b06bfc28f33e8d936 (diff) | |
| download | linux-b2dfa048bae3b4afe1944237c1ee9525df00bb6f.tar.xz | |
replace strict_strto* call with kstrto*
remove obsolete calls to strict_strto* and replace them
with kstrto* calls accordingly.
Signed-off-by: Daniel Walter <dwalter@google.com>
Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/tile/kernel/setup.c | 7 | ||||
| -rw-r--r-- | arch/tile/kernel/signal.c | 7 | ||||
| -rw-r--r-- | arch/tile/kernel/traps.c | 5 | ||||
| -rw-r--r-- | arch/tile/mm/init.c | 2 |
4 files changed, 8 insertions, 13 deletions
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c index 0073247..112abab 100644 --- 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; diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c index 2d1dbf3..d1d026f 100644 --- a/arch/tile/kernel/signal.c +++ b/arch/tile/kernel/signal.c @@ -321,14 +321,13 @@ int show_unhandled_signals = 1; static int __init crashinfo(char *str) { - unsigned long val; const char *word; if (*str == '\0') - val = 2; - else if (*str != '=' || strict_strtoul(++str, 0, &val) != 0) + show_unhandled_signals = 2; + else if (*str != '=' || kstrtoint(++str, 0, &show_unhandled_signals) != 0) return 0; - show_unhandled_signals = val; + switch (show_unhandled_signals) { case 0: word = "No"; diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c index 6b603d5..f3ceb63 100644 --- a/arch/tile/kernel/traps.c +++ b/arch/tile/kernel/traps.c @@ -42,10 +42,9 @@ static int __init setup_unaligned_fixup(char *str) * will still parse the instruction, then fire a SIGBUS with * the correct address from inside the single_step code. */ - long val; - if (strict_strtol(str, 0, &val) != 0) + if (kstrtoint(str, 0, &unaligned_fixup) != 0) return 0; - unaligned_fixup = val; + pr_info("Fixups for unaligned data accesses are %s\n", unaligned_fixup >= 0 ? (unaligned_fixup ? "enabled" : "disabled") : diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c index 7ba1dc3..bfb3127 100644 --- a/arch/tile/mm/init.c +++ b/arch/tile/mm/init.c @@ -912,7 +912,7 @@ static long __write_once initfree = 1; static int __init set_initfree(char *str) { long val; - if (strict_strtol(str, 0, &val) == 0) { + if (kstrtol(str, 0, &val) == 0) { initfree = val; pr_info("initfree: %s free init pages\n", initfree ? "will" : "won't"); |