diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 1 | ||||
-rw-r--r-- | init/do_mounts_initrd.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 96b54595f1dc..d54d0cadcc06 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -488,6 +488,7 @@ config SIGNALFD | |||
488 | config TIMERFD | 488 | config TIMERFD |
489 | bool "Enable timerfd() system call" if EMBEDDED | 489 | bool "Enable timerfd() system call" if EMBEDDED |
490 | select ANON_INODES | 490 | select ANON_INODES |
491 | depends on BROKEN | ||
491 | default y | 492 | default y |
492 | help | 493 | help |
493 | Enable the timerfd() system call that allows to receive timer | 494 | Enable the timerfd() system call that allows to receive timer |
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index a6b4c0c08e13..fd4fc12d2624 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c | |||
@@ -57,8 +57,10 @@ static void __init handle_initrd(void) | |||
57 | 57 | ||
58 | pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); | 58 | pid = kernel_thread(do_linuxrc, "/linuxrc", SIGCHLD); |
59 | if (pid > 0) | 59 | if (pid > 0) |
60 | while (pid != sys_wait4(-1, NULL, 0, NULL)) | 60 | while (pid != sys_wait4(-1, NULL, 0, NULL)) { |
61 | try_to_freeze(); | ||
61 | yield(); | 62 | yield(); |
63 | } | ||
62 | 64 | ||
63 | /* move initrd to rootfs' /old */ | 65 | /* move initrd to rootfs' /old */ |
64 | sys_fchdir(old_fd); | 66 | sys_fchdir(old_fd); |