2 files changed, 2 insertions, 2 deletions

diff --git a/init/bootchartd.c b/init/bootchartd.c
index 0929890a3..a5447c6ad 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.c
@@ -133,7 +133,7 @@ static void dump_file(FILE *fp, const char *filename)
 static int dump_procs(FILE *fp, int look_for_login_process)
 {
         struct dirent *entry;
-        DIR *dir = opendir("/proc");
+        DIR *dir = xopendir("/proc");
         int found_login_process = 0;
 
         fputs(G.jiffy_line, fp);
diff --git a/init/init.c b/init/init.c
index 797e0a0eb..294be9952 100644
--- a/init/init.c
+++ b/init/init.c
@@ -1201,7 +1201,7 @@ int init_main(int argc UNUSED_PARAM, char **argv)
                         int status;
                         struct init_action *a;
 
-                        wpid = waitpid(-1, &status, WNOHANG);
+                        wpid = wait_any_nohang(&status);
                         if (wpid <= 0)
                                 break;