diff options
| author | Len Brown <len.brown@intel.com> | 2007-12-06 16:52:00 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-12-06 16:52:00 -0500 |
| commit | 982286d1b8e438f595cdc9304cc4c185c7b90a39 (patch) | |
| tree | bf310a3ab93f92c21f3a1c8f8ff1321602922fab /init | |
| parent | 921314811be704252ad2caa8dde507d4c421ddc4 (diff) | |
| parent | 8baabde66c60a84781c718c28fe283ed411a7bd0 (diff) | |
Pull bugzilla-9345 into release branch
Diffstat (limited to 'init')
| -rw-r--r-- | init/do_mounts_initrd.c | 12 |
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); |