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>
This commit is contained in:
Родитель
ba159fd387
Коммит
b2dfa048ba
|
@ -228,13 +228,10 @@ early_param("isolnodes", setup_isolnodes);
|
||||||
#if defined(CONFIG_PCI) && !defined(__tilegx__)
|
#if defined(CONFIG_PCI) && !defined(__tilegx__)
|
||||||
static int __init setup_pci_reserve(char* str)
|
static int __init setup_pci_reserve(char* str)
|
||||||
{
|
{
|
||||||
unsigned long mb;
|
if (str == NULL || kstrtouint(str, 0, &pci_reserve_mb) != 0 ||
|
||||||
|
pci_reserve_mb > 3 * 1024)
|
||||||
if (str == NULL || strict_strtoul(str, 0, &mb) != 0 ||
|
|
||||||
mb > 3 * 1024)
|
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
pci_reserve_mb = mb;
|
|
||||||
pr_info("Reserving %dMB for PCIE root complex mappings\n",
|
pr_info("Reserving %dMB for PCIE root complex mappings\n",
|
||||||
pci_reserve_mb);
|
pci_reserve_mb);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -321,14 +321,13 @@ int show_unhandled_signals = 1;
|
||||||
|
|
||||||
static int __init crashinfo(char *str)
|
static int __init crashinfo(char *str)
|
||||||
{
|
{
|
||||||
unsigned long val;
|
|
||||||
const char *word;
|
const char *word;
|
||||||
|
|
||||||
if (*str == '\0')
|
if (*str == '\0')
|
||||||
val = 2;
|
show_unhandled_signals = 2;
|
||||||
else if (*str != '=' || strict_strtoul(++str, 0, &val) != 0)
|
else if (*str != '=' || kstrtoint(++str, 0, &show_unhandled_signals) != 0)
|
||||||
return 0;
|
return 0;
|
||||||
show_unhandled_signals = val;
|
|
||||||
switch (show_unhandled_signals) {
|
switch (show_unhandled_signals) {
|
||||||
case 0:
|
case 0:
|
||||||
word = "No";
|
word = "No";
|
||||||
|
|
|
@ -42,10 +42,9 @@ static int __init setup_unaligned_fixup(char *str)
|
||||||
* will still parse the instruction, then fire a SIGBUS with
|
* will still parse the instruction, then fire a SIGBUS with
|
||||||
* the correct address from inside the single_step code.
|
* the correct address from inside the single_step code.
|
||||||
*/
|
*/
|
||||||
long val;
|
if (kstrtoint(str, 0, &unaligned_fixup) != 0)
|
||||||
if (strict_strtol(str, 0, &val) != 0)
|
|
||||||
return 0;
|
return 0;
|
||||||
unaligned_fixup = val;
|
|
||||||
pr_info("Fixups for unaligned data accesses are %s\n",
|
pr_info("Fixups for unaligned data accesses are %s\n",
|
||||||
unaligned_fixup >= 0 ?
|
unaligned_fixup >= 0 ?
|
||||||
(unaligned_fixup ? "enabled" : "disabled") :
|
(unaligned_fixup ? "enabled" : "disabled") :
|
||||||
|
|
|
@ -912,7 +912,7 @@ static long __write_once initfree = 1;
|
||||||
static int __init set_initfree(char *str)
|
static int __init set_initfree(char *str)
|
||||||
{
|
{
|
||||||
long val;
|
long val;
|
||||||
if (strict_strtol(str, 0, &val) == 0) {
|
if (kstrtol(str, 0, &val) == 0) {
|
||||||
initfree = val;
|
initfree = val;
|
||||||
pr_info("initfree: %s free init pages\n",
|
pr_info("initfree: %s free init pages\n",
|
||||||
initfree ? "will" : "won't");
|
initfree ? "will" : "won't");
|
||||||
|
|
Загрузка…
Ссылка в новой задаче