lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pull bugzilla-9345 into release branch

Browse Source
This commit is contained in:
Len Brown
2007-12-06 16:52:00 -05:00
parent 921314811b 8baabde66c
commit 982286d1b8
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
init/do_mounts_initrd.c
View File

@@ -55,12 +55,18 @@ static void __init handle_initrd(void)
sys_mount(".", "/", NULL, MS_MOVE, NULL); sys_mount(".", "/", NULL, MS_MOVE, NULL);
sys_chroot("."); sys_chroot(".");
/*
* In case that a resume from disk is carried out by linuxrc or one of
* its children, we need to tell the freezer not to wait for us.
*/
current->flags |= PF_FREEZER_SKIP;
pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
if (pid > 0) if (pid > 0)
while (pid != sys_wait4(-1, NULL, 0, NULL)) { while (pid != sys_wait4(-1, NULL, 0, NULL))
try_to_freeze();
yield(); yield();
}
current->flags &= ~PF_FREEZER_SKIP;
/* move initrd to rootfs' /old */ /* move initrd to rootfs' /old */
sys_fchdir(old_fd); sys_fchdir(old_fd);