1 files changed, 14 insertions, 7 deletions

diff --git a/kernel/reboot.c b/kernel/reboot.c
index 662c83fc16b7..a3a9e240fcdb 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -388,15 +388,22 @@ static int __init reboot_setup(char *str)
                         break;
 
                 case 's':
-                        if (isdigit(*(str+1)))
-                                reboot_cpu = simple_strtoul(str+1, NULL, 0);
-                        else if (str[1] == 'm' && str[2] == 'p' &&
-                                                        isdigit(*(str+3)))
-                                reboot_cpu = simple_strtoul(str+3, NULL, 0);
-                        else
+                {
+                        int rc;
+
+                        if (isdigit(*(str+1))) {
+                                rc = kstrtoint(str+1, 0, &reboot_cpu);
+                                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;
                         break;
-
+                }
                 case 'g':
                         reboot_mode = REBOOT_GPIO;
                         break;