AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

kernel/reboot.c: convert simple_strtoul to kstrtoint

Browse Source 
Replace obsolete function.
kstrtoint is used as reboot_cpu is an integer.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Fabian Frederick 2014-06-04 16:11:25 -07:00 committed by Linus Torvalds
parent 6c5a53c670
commit 616feab753
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kernel/reboot.c
View File

@ -388,15 +388,22 @@ static int __init reboot_setup(char *str)
break; break;
case 's': case 's':
if (isdigit(*(str+1))) {
reboot_cpu = simple_strtoul(str+1, NULL, 0); int rc;
else if (str[1] == 'm' && str[2] == 'p' &&
isdigit(*(str+3))) if (isdigit(*(str+1))) {
reboot_cpu = simple_strtoul(str+3, NULL, 0); rc = kstrtoint(str+1, 0, &reboot_cpu);
else if (rc)
return rc;
} else if (str[1] == 'm' && str[2] == 'p' &&
isdigit(*(str+3))) {
rc = kstrtoint(str+3, 0, &reboot_cpu);
if (rc)
return rc;
} else
reboot_mode = REBOOT_SOFT; reboot_mode = REBOOT_SOFT;
break; break;
}
case 'g': case 'g':
reboot_mode = REBOOT_GPIO; reboot_mode = REBOOT_GPIO;
break; break;