Skip to contentSkip to conversation

freezer: Remove PF_NOFREEZE from handle_initrd

PATCH In review Rafael J. Wysocki 4 participants 4 messages Apr 7, 2007 – Apr 8, 2007 VFS

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 freezer: Remove PF_NOFREEZE from handle_initrd

From: Rafael J. Wysocki <[email protected]>

Make handle_initrd() call try_to_freeze() in a suitable place instead of setting PF_NOFREEZE for the current task.

---
 init/do_mounts_initrd.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
init/do_mounts_initrd.c +3 -2
Index: linux-2.6.21-rc6/init/do_mounts_initrd.c
===================================================================
@@ -55,11 +55,12 @@ static void __init handle_initrd(void)
 	sys_mount(".", "/", NULL, MS_MOVE, NULL);
 	sys_chroot(".");
 
-	current->flags |= PF_NOFREEZE;
 	pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
 	if (pid > 0) {
-		while (pid != sys_wait4(-1, NULL, 0, NULL))
+		while (pid != sys_wait4(-1, NULL, 0, NULL)) {
+			try_to_freeze();
 			yield();
+		}
 	}
 
 	/* move initrd to rootfs' /old */
#2 lore raw
In reply to Rafael J. Wysocki

Hi.

Quoted 19 lines · Rafael J. Wysocki

From: Rafael J. Wysocki <[email protected]>

Make handle_initrd() call try_to_freeze() in a suitable place instead of setting PF_NOFREEZE for the current task.

---
 init/do_mounts_initrd.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Index: linux-2.6.21-rc6/init/do_mounts_initrd.c
===================================================================

init/do_mounts_initrd.c +0 -1
@@ -55,11 +55,12 @@ static void __init handle_initrd(void)
 	sys_mount(".", "/", NULL, MS_MOVE, NULL);
 	sys_chroot(".");
 
-	current->flags |= PF_NOFREEZE;

init/do_mounts_initrd.c static void __init handle_initrd(void) · line 66

Quoted 10 lines
init/do_mounts_initrd.c +3 -1
 	pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD);
 	if (pid > 0) {
-		while (pid != sys_wait4(-1, NULL, 0, NULL))
+		while (pid != sys_wait4(-1, NULL, 0, NULL)) {
+			try_to_freeze();
 			yield();
+		}
 	}
 
 	/* move initrd to rootfs' /old */

ACK.

Regards,

Nigel

#3 lore raw
In reply to Rafael J. Wysocki

Hi!

Quoted 4 lines

From: Rafael J. Wysocki <[email protected]>

Make handle_initrd() call try_to_freeze() in a suitable place instead of setting PF_NOFREEZE for the current task.

ACK and thanks.

Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html