Merge branch 'for-2.6.30' into for-2.6.31

[sfrench/cifs-2.6.git] / init / do_mounts_initrd.c

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index fd4fc12d262464b0b763e2e0fb5dd1781f2a3b70..614241b5200cf906c066288ac15a42df835490ce 100644 (file)
--- 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);