Hi. On Thursday 22 November 2007 09:25:32 Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rjw@xxxxxxx> > > Add appropriate freezer annotations to handle_initrd(), so that it's possible > to resume from disk from an initrd. > > This patch fixes Bug #9345: http://bugzilla.kernel.org/show_bug.cgi?id=9345 > > Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> > Cc: Pavel Machek <pavel@xxxxxx> > Cc: Nigel Cunningham <nigel@xxxxxxxxxxxx> > Cc: Ingo Molnar <mingo@xxxxxxx> > Cc: Chris Friedhoff <chris@xxxxxxxxxxxxx> > --- > init/do_mounts_initrd.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > Index: linux-2.6/init/do_mounts_initrd.c > =================================================================== > --- linux-2.6.orig/init/do_mounts_initrd.c > +++ linux-2.6/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); > > Ack. This fixes the issue for me, too. Nigel -- See http://www.tuxonice.net for Howtos, FAQs, mailing lists, wiki and bugzilla info. _______________________________________________ linux-pm mailing list linux-pm@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/linux-pm
