diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-20 10:09:27 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-20 10:09:27 +1000 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /init | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
| download | kernel_goldelico_gta04-0ce49a3945474fc942ec37c0c0efece60f592f80.zip kernel_goldelico_gta04-0ce49a3945474fc942ec37c0c0efece60f592f80.tar.gz kernel_goldelico_gta04-0ce49a3945474fc942ec37c0c0efece60f592f80.tar.bz2 | |
Merge branch 'linux-2.6'
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 96b5459..d54d0ca 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -488,6 +488,7 @@ config SIGNALFD config TIMERFD bool "Enable timerfd() system call" if EMBEDDED select ANON_INODES + depends on BROKEN default y help 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 a6b4c0c..fd4fc12 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -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); |