Commit 7e21b67f authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: finish the signals across a reboot fix

Due to me not refreshing this patch earlier, the last reboot signals patch was
missing the actual fix.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 152856ea
...@@ -147,7 +147,21 @@ int main(int argc, char **argv, char **envp) ...@@ -147,7 +147,21 @@ int main(int argc, char **argv, char **envp)
/* Reboot */ /* Reboot */
if(ret){ if(ret){
int err;
printf("\n"); printf("\n");
/* Let any pending signals fire, then disable them. This
* ensures that they won't be delivered after the exec, when
* they are definitely not expected.
*/
unblock_signals();
disable_timer();
err = deactivate_all_fds();
if(err)
printf("deactivate_all_fds failed, errno = %d\n",
-err);
execvp(new_argv[0], new_argv); execvp(new_argv[0], new_argv);
perror("Failed to exec kernel"); perror("Failed to exec kernel");
ret = 1; ret = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment