1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/sys.c b/kernel/sys.c
index f9492284e5d2..c5cb5b99cb81 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -368,6 +368,7 @@ EXPORT_SYMBOL(unregister_reboot_notifier);
 void kernel_restart(char *cmd)
 {
         kernel_restart_prepare(cmd);
+        disable_nonboot_cpus();
         if (!cmd)
                 printk(KERN_EMERG "Restarting system.\n");
         else
@@ -2204,7 +2205,7 @@ static int __orderly_poweroff(void)
                 return -ENOMEM;
         }
 
-        ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_NO_WAIT,
+        ret = call_usermodehelper_fns(argv[0], argv, envp, UMH_WAIT_EXEC,
                                       NULL, argv_cleanup, NULL);
         if (ret == -ENOMEM)
                 argv_free(argv);