Freezer: Fix s2disk resume from initrd

Add appropriate freezer annotations to handle_initrd(), so that it's possible
to resume from disk from an initrd.

http://bugzilla.kernel.org/show_bug.cgi?id=9345

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Nigel Cunningham <nigel@nigel.suspend2.net>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Chris Friedhoff <chris@friedhoff.org>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index fd4fc12d2624..614241b5200c 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);