Merge branch 'busybox' into merge

2 files changed, 4 insertions, 4 deletions

diff --git a/init/halt.c b/init/halt.c
index fe3cb9e75..7aea8cfec 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -7,19 +7,19 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config HALT
-//config:       bool "halt (4 kb)"
+//config:       bool "halt (4.3 kb)"
 //config:       default y
 //config:       help
 //config:       Stop all processes and halt the system.
 //config:
 //config:config POWEROFF
-//config:       bool "poweroff (4 kb)"
+//config:       bool "poweroff (4.3 kb)"
 //config:       default y
 //config:       help
 //config:       Stop all processes and power off the system.
 //config:
 //config:config REBOOT
-//config:       bool "reboot (4 kb)"
+//config:       bool "reboot (4.3 kb)"
 //config:       default y
 //config:       help
 //config:       Stop all processes and reboot the system.
diff --git a/init/init.c b/init/init.c
index 1e1ce833d..2ee1e4cde 100644
--- a/init/init.c
+++ b/init/init.c
@@ -500,7 +500,7 @@ static pid_t run(const struct init_action *a)
 
         /* Open the new terminal device */
         if (!open_stdio_to_tty(a->terminal))
-                _exit(EXIT_FAILURE);
+                _exit_FAILURE();
 
         /* NB: on NOMMU we can't wait for input in child, so
          * "askfirst" will work the same as "respawn". */