Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge

Conflicts:
	include/platform.h

2 files changed, 3 insertions, 2 deletions

diff --git a/init/halt.c b/init/halt.c
index 1aac0faf9..7974adb17 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -159,7 +159,7 @@ int halt_main(int argc UNUSED_PARAM, char **argv)
                                                 which == 2 ? "6" : "0",
                                                 (char *)NULL
                                 );
-                                perror_msg_and_die("can't execute '%s'",
+                                bb_perror_msg_and_die("can't execute '%s'",
                                                 CONFIG_TELINIT_PATH);
                         }
                 }
diff --git a/init/init.c b/init/init.c
index ff9dc06a4..645f694c0 100644
--- a/init/init.c
+++ b/init/init.c
@@ -113,7 +113,8 @@
 #include <paths.h>
 #include <sys/resource.h>
 #ifdef __linux__
-#include <linux/vt.h>
+# include <linux/vt.h>
+# include <sys/sysinfo.h>
 #endif
 #include "reboot.h" /* reboot() constants */