aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki2007-11-20 19:50:17 -0600
committerLen Brown2007-11-20 21:22:42 -0600
commit8baabde66c60a84781c718c28fe283ed411a7bd0 (patch)
tree0bd71f2f6277aeffafb223301dec3f483ebb4bb9 /init/do_mounts_initrd.c
parent2ffbb8377c7a0713baf6644e285adc27a5654582 (diff)
downloadkernel-8baabde66c60a84781c718c28fe283ed411a7bd0.tar.gz
kernel-8baabde66c60a84781c718c28fe283ed411a7bd0.tar.xz
kernel-8baabde66c60a84781c718c28fe283ed411a7bd0.zip
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>
Diffstat (limited to 'init/do_mounts_initrd.c')
-rw-r--r--init/do_mounts_initrd.c12
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)
55 sys_mount(".", "/", NULL, MS_MOVE, NULL); 55 sys_mount(".", "/", NULL, MS_MOVE, NULL);
56 sys_chroot("."); 56 sys_chroot(".");
57 57
58 /*
59 * In case that a resume from disk is carried out by linuxrc or one of
60 * its children, we need to tell the freezer not to wait for us.
61 */
62 current->flags |= PF_FREEZER_SKIP;
63
58 pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); 64 pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
59 if (pid > 0) 65 if (pid > 0)
60 while (pid != sys_wait4(-1, NULL, 0, NULL)) { 66 while (pid != sys_wait4(-1, NULL, 0, NULL))
61 try_to_freeze();
62 yield(); 67 yield();
63 } 68
69 current->flags &= ~PF_FREEZER_SKIP;
64 70
65 /* move initrd to rootfs' /old */ 71 /* move initrd to rootfs' /old */
66 sys_fchdir(old_fd); 72 sys_fchdir(old_fd);