Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8baabde6 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

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: default avatarRafael 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: default avatarLen Brown <len.brown@intel.com>
parent 2ffbb837

init/do_mounts_initrd.c

+9 −3
Original line number Diff line number Diff line
@@ -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);