aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-12-06 16:52:00 -0500
committerLen Brown <len.brown@intel.com>2007-12-06 16:52:00 -0500
commit982286d1b8e438f595cdc9304cc4c185c7b90a39 (patch)
treebf310a3ab93f92c21f3a1c8f8ff1321602922fab /init
parent921314811be704252ad2caa8dde507d4c421ddc4 (diff)
parent8baabde66c60a84781c718c28fe283ed411a7bd0 (diff)
downloadlinux-982286d1b8e438f595cdc9304cc4c185c7b90a39.tar.gz
Pull bugzilla-9345 into release branch
Diffstat (limited to 'init')
-rw-r--r--init/do_mounts_initrd.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index fd4fc12d262..614241b5200 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -55,12 +55,18 @@ static void __init handle_initrd(void)
sys_mount(".", "/", NULL, MS_MOVE, NULL);
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);
if (pid > 0)
- while (pid != sys_wait4(-1, NULL, 0, NULL)) {
- try_to_freeze();
+ while (pid != sys_wait4(-1, NULL, 0, NULL))
yield();
- }
+
+ current->flags &= ~PF_FREEZER_SKIP;
/* move initrd to rootfs' /old */
sys_fchdir(old_fd);