Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux.git] / init / do_mounts_initrd.c

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index a6b4c0c08e13ea4bc1db5ade1cf8eb73d18c7d72..614241b5200cf906c066288ac15a42df835490ce 100644 (file)
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -55,11 +55,19 @@ 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))
                        yield();
 
+       current->flags &= ~PF_FREEZER_SKIP;
+
        /* move initrd to rootfs' /old */
        sys_fchdir(old_fd);
        sys_mount("/", ".", NULL, MS_MOVE, NULL);