Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 65019
b: refs/heads/master
c: 019ad4a
h: refs/heads/master
i:
  65017: 324750c
  65015: 00c0e03
v: v3
  • Loading branch information
Nigel Cunningham authored and Linus Torvalds committed Sep 19, 2007
1 parent d3afbfb commit 69ac8ba
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2c392a4f47f41b24432e6aa77bb5167d0bbb10c5
refs/heads/master: 019ad4a0a60b09022945273848b5a686e39a78aa
4 changes: 3 additions & 1 deletion trunk/init/do_mounts_initrd.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ static void __init handle_initrd(void)

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 */
sys_fchdir(old_fd);
Expand Down

0 comments on commit 69ac8ba

Please sign in to comment.