X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=init%2Fdo_mounts_initrd.c;h=614241b5200cf906c066288ac15a42df835490ce;hb=342a437ef625953e8bdeee3bc1605ccd27a38863;hp=2cfd7cb36e7963bee6987c826c39a3411459666d;hpb=7dfb71030f7636a0d65200158113c37764552f93;p=safe%2Fjmp%2Flinux-2.6

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 2cfd7cb..614241b 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(".");
 
-	current->flags |= PF_NOFREEZE;
+	/*
+	 * 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) {
+	if (pid > 0)
 		while (pid != sys_wait4(-1, NULL, 0, NULL))
 			yield();
-	}
+
+	current->flags &= ~PF_FREEZER_SKIP;
 
 	/* move initrd to rootfs' /old */
 	sys_fchdir(old_fd);